[gnome-music/freeze-break: 19/107] Fix conflicts

[Arnel A. Borja <arnelborja src gnome org>]

commit 776e2699acd1c5a74e769b5c02005f2ce14afe8c
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Tue Sep 3 15:41:48 2013 +0200

    Fix conflicts

 gnomemusic/view.py |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index 2c9d09e..ffdecfe 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -367,10 +367,6 @@ class Songs(ViewContainer):
         if not item:
             return
         self._offset += 1
-<<<<<<< HEAD
-=======
-        _iter = self._model.append(None)
->>>>>>> Make some views filterable
         item.set_title(albumArtCache.get_media_title(item))
         artist = item.get_string(Grl.METADATA_KEY_ARTIST)\
             or item.get_author()\