[shotwell] Remove merge issues from shotwell.ui

[Jens Georg <jensgeorg src gnome org>]

commit 5829627cef569db0574cba1de831b9af4e400edd
Author: Jens Georg <mail jensge org>
Date:   Wed Dec 20 23:16:32 2017 +0100

    Remove merge issues from shotwell.ui

 ui/shotwell.ui |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/ui/shotwell.ui b/ui/shotwell.ui
index f8659d6..af41b10 100644
--- a/ui/shotwell.ui
+++ b/ui/shotwell.ui
@@ -2,14 +2,6 @@
 <!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
   <requires lib="gtk+" version="3.18"/>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
   <object class="GtkBox" id="progress_pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>