:wqMerge branch 'master' of ssh://github.com/muccc/acab-streetlife

Conflicts: animations/toto.py
muccc · Feb 26, 2017 · 7fae72b · 7fae72b
2 parents 2f850fe + 138ad4d
commit 7fae72b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/animations/toto.py b/animations/toto.py
@@ -128,6 +128,7 @@ def processPlaylist(self, playlist):
         if not playlist:
             logger.debug("empty playlist")
             return
+
         logger.info("new playlist: %s" % str(playlist))
         for action in playlist:
             for instruction in action: