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

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

commit b8552103c92f9e962690280a1d2059157d576423
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Tue Sep 3 15:46:01 2013 +0200

    Fix ALL conflicts

 gnomemusic/view.py |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index ffdecfe..63d90e1 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -519,11 +519,7 @@ class Artists (ViewContainer):
     def _populate(self, data=None):
         selection = self.view.get_generic_view().get_selection()
         if not selection.get_selected()[1]:
-<<<<<<< HEAD
             self._allIter = self._model.insert_with_valuesv(-1, [2], [_("All Artists")])
-=======
-            self._allIter = self._model.append(None)
->>>>>>> Make some views filterable
             self._last_selection = self._allIter
             self._artists[_("All Artists").lower()] =\
                 {'iter': self._allIter, 'albums': []}
@@ -590,11 +586,7 @@ class Artists (ViewContainer):
             or item.get_author()\
             or _("Unknown Artist")
         if not artist.lower() in self._artists:
-<<<<<<< HEAD
             _iter = self._model.insert_with_valuesv(-1, [2], [artist])
-=======
-            _iter = self._model.append(None)
->>>>>>> Make some views filterable
             self._artists[artist.lower()] = {'iter': _iter, 'albums': []}
 
         self._artists[artist.lower()]['albums'].append(item)