Conflicts: mopidy_touchscreen/dynamic_background.py mopidy_touchscreen/screen_manager.py
@@ -1,9 +1,13 @@
import random
+<<<<<<< HEAD
change_speed = 2
import pygame
+=======
+import pygame
+>>>>>>> d49db26693cc07087bc620dcdc603290ef56557b
class DynamicBackground():
def __init__(self, size):
@@ -29,7 +29,6 @@ class ScreenManager():
self.core = core
self.cache = cache
self.fonts = {}
- self.background = DynamicBackground(size)
self.current_screen = library_index
self.init_manager(size)