line 70 in /usr/lib//rhythmbox/plugins/umusicstore/__init__.py
def deactivate(self, shell):
"""Plugin shutdown."""
<<<<<<< TREE
# remove source self.source.delete_thyself()
line 446 in /usr/lib//rhythmbox/plugins/umusicstore/__init__.py
#======= self.music_store_widget.deactivate(shell) self.music_store_links_provider.deactivate(shell)
#>>>>>>> MERGE-SOURCE
line 70 in /usr/lib/ /rhythmbox/ plugins/ umusicstore/ __init_ _.py
self.source. delete_ thyself( )
def deactivate(self, shell):
"""Plugin shutdown."""
<<<<<<< TREE
# remove source
line 446 in /usr/lib/ /rhythmbox/ plugins/ umusicstore/ __init_ _.py
self.music_ store_widget. deactivate( shell)
self.music_ store_links_ provider. deactivate( shell)
#=======
#>>>>>>> MERGE-SOURCE