[gnumeric] Fixed merging accidents.

[Jean BrÃfort <jbrefort src gnome org>]

commit a10410bf229e58f4bd2bb303a432d6e68875013c
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Aug 2 11:09:42 2011 +0200

    Fixed merging accidents.

 src/dialogs/cell-format.ui   |    3 ---
 src/dialogs/doc-meta-data.ui |    8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/src/dialogs/cell-format.ui b/src/dialogs/cell-format.ui
index f4a3543..f3efab3 100644
--- a/src/dialogs/cell-format.ui
+++ b/src/dialogs/cell-format.ui
@@ -3109,8 +3109,6 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
-<<<<<<< HEAD
-=======
             <child>
               <object class="GtkTable" id="table8">
                 <property name="visible">True</property>
@@ -3266,7 +3264,6 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
->>>>>>> eradicate Gtk[H,V]*
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/src/dialogs/doc-meta-data.ui b/src/dialogs/doc-meta-data.ui
index 9b54f8b..0b8cb57 100644
--- a/src/dialogs/doc-meta-data.ui
+++ b/src/dialogs/doc-meta-data.ui
@@ -1105,8 +1105,7 @@
                       </packing>
                     </child>
                     <child>
-<<<<<<< HEAD
-                      <object class="GtkHBox" id="hbox3">
+                      <object class="GtkBox" id="hbox3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -1122,7 +1121,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHButtonBox" id="hbuttonbox2">
+                          <object class="GtkButtonBox" id="hbuttonbox2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
@@ -1158,10 +1157,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHSeparator" id="hseparator4">
-=======
                       <object class="GtkSeparator" id="hseparator4">
->>>>>>> eradicate Gtk[H,V]*
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>