Fix error

9and3r · Jan 10, 2015 · c2b3a16 · c2b3a16
1 parent d74aa1d
commit c2b3a16
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/mopidy_touchscreen/dynamic_background.py b/mopidy_touchscreen/dynamic_background.py
@@ -1,13 +1,10 @@
 import random
 
-<<<<<<< HEAD
 change_speed = 2
 
 import pygame
 
-=======
-import pygame
->>>>>>> d49db26693cc07087bc620dcdc603290ef56557b
+
 
 class DynamicBackground():
     def __init__(self, size):