[shotwell] Remove merge left-over

[Jens Georg <jensgeorg src gnome org>]

commit 0d8a1f081f917cd4f003d49e21a81dbc805e193a
Author: Jens Georg <mail jensge org>
Date:   Sat Jul 7 13:15:24 2018 +0200

    Remove merge left-over

 src/library/LibraryWindow.vala | 1 -
 1 file changed, 1 deletion(-)
---
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index ea3bea21..b9acb221 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -306,7 +306,6 @@ public class LibraryWindow : AppWindow {
         lookup_action ("CommonDisplaySearchbar").change_state 
(Config.Facade.get_instance().get_display_search_bar());
         lookup_action ("CommonDisplaySidebar").change_state (is_sidebar_visible ());
         lookup_action ("CommonDisplayToolbar").change_state (is_toolbar_visible ());
-//>>>>>>> origin/master
     }
 
     protected override void switched_pages(Page? old_page, Page? new_page) {