fix

ublexec.glade

@@ -958,8 +958,6 @@
     <property name="margin-bottom">6</property>
     <property name="stock">gtk-media-play</property>
   </object>
-<<<<<<< HEAD
-=======
   <object class="GtkListStore" id="list_Other">
     <columns>
       <!-- column-name gchararray1 -->
@@ -1006,7 +1004,6 @@
       </object>
     </child>
   </object>
->>>>>>> devel
   <object class="GtkWindow" id="window">
     <property name="can-focus">False</property>
     <child>
@@ -1765,8 +1762,6 @@ specified priority</property>
         </child>
       </object>
     </child>
-<<<<<<< HEAD
-=======
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerBar">
         <property name="visible">True</property>
@@ -1825,7 +1820,6 @@ specified priority</property>
         </child>
       </object>
     </child>
->>>>>>> devel
   </object>
   <object class="GtkMessageDialog" id="messageError">
     <property name="can-focus">False</property>