From c2b3a16cd3ee91507392967b1aa1a2235ce40b30 Mon Sep 17 00:00:00 2001
From: Ander <9and3r@gmail.com>
Date: Sat, 10 Jan 2015 01:07:35 +0100
Subject: [PATCH] Fix error

---
 mopidy_touchscreen/dynamic_background.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mopidy_touchscreen/dynamic_background.py b/mopidy_touchscreen/dynamic_background.py
index 469bb33..955648d 100644
--- 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):