From c862c572869c2b9f0e539ac46402e1bf221cff6b Mon Sep 17 00:00:00 2001
From: Ander <9and3r@gmail.com>
Date: Thu, 9 Apr 2015 01:31:24 +0200
Subject: [PATCH] Fix conflicts

---
 mopidy_touchscreen/screen_manager.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py
index d85fe08..337d728 100644
--- a/mopidy_touchscreen/screen_manager.py
+++ b/mopidy_touchscreen/screen_manager.py
@@ -38,10 +38,6 @@ class ScreenManager():
         self.track = None
         self.input_manager = InputManager(size)
         self.down_bar_objects = ScreenObjectsManager()
-<<<<<<< HEAD
-        self.down_bar_solid = None
-=======
->>>>>>> background-cover
         self.down_bar = None
 
         self.init_manager(size)
@@ -135,16 +131,8 @@ class ScreenManager():
         self.change_screen(self.current_screen)
 
     def update(self):
-<<<<<<< HEAD
-        surface = pygame.Surface(self.size)
-        self.background.draw_background([surface,
-                                         self.down_bar_solid])
-        self.screens[self.current_screen].update(surface)
-        surface.blit(self.down_bar_solid, (0, self.base_size * 7))
-=======
         surface = self.background.draw_background()
         self.screens[self.current_screen].update(surface)
->>>>>>> background-cover
         surface.blit(self.down_bar, (0, self.base_size * 7))
         self.down_bar_objects.render(surface)
         return surface