fix

3 years ago · 621a4afab6
parent a6a74908c3
commit 621a4afab6
1 changed files with 0 additions and 4 deletions
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@ -166,10 +166,6 @@
                    <property name="margin-end">5</property>
                    <property name="margin-top">6</property>
                    <property name="margin-bottom">6</property>
-<<<<<<< HEAD
-                    <property name="stock">gtk-missing-image</property>
-=======
->>>>>>> develop
                    <property name="pixel-size">25</property>
                    <property name="icon_size">1</property>
                  </object>