Last active
December 21, 2015 01:48
-
-
Save shivanipods/6230169 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| shivani@shivani:~/checkout/gnome/gnome-music$ cat new | |
| diff --cc gnomemusic/view.py | |
| index d2160b2,1df36d9..0000000 | |
| --- a/gnomemusic/view.py | |
| +++ b/gnomemusic/view.py | |
| @@@ -102,7 -101,7 +102,11 @@@ class ViewContainer(Stack) | |
| self._on_view_selection_changed) | |
| def _get_remaining_item_count(self): | |
| ++<<<<<<< HEAD | |
| + return Widgets._get_remaining_item_count(self.countQuery, self._offset) | |
| ++======= | |
| + return Widgets._get_remaining_item_count_(self.countQuery, self._offset) | |
| ++>>>>>>> 002504c... Making _counter() a func everywhere | |
| def _on_header_bar_toggled(self, button): | |
| if button.get_active(): | |
| diff --cc gnomemusic/widgets.py | |
| index 22aa0f6,6af9328..0000000 | |
| --- a/gnomemusic/widgets.py | |
| +++ b/gnomemusic/widgets.py | |
| @@@ -404,7 -404,7 +404,11 @@@ class AllArtistsAlbums(ArtistAlbums) | |
| self._populate() | |
| def _get_remaining_item_count(self): | |
| ++<<<<<<< HEAD | |
| + return _get_remaining_item_count(self.countQuery, self._offset) | |
| ++======= | |
| + return _get_remaining_item_count_(self.countQuery, self._offset) | |
| ++>>>>>>> 002504c... Making _counter() a func everywhere | |
| def _connect_view(self): | |
| self._adjustmentValueId =\ | |
| diff --git a/libgd b/libgd | |
| --- a/libgd | |
| +++ b/libgd | |
| @@ -1 +1 @@ | |
| -Subproject commit f3822bc9fa387076a8005fb2665cc13390055156 | |
| +Subproject commit f3822bc9fa387076a8005fb2665cc13390055156-dirty |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment