fix

Makefile

@@ -118,7 +118,7 @@ install: check uninstall
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-checked.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-warning.svg"
-	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
+	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
 	@echo "Install: OK"

ubl-settings-datetime.glade

@@ -166,7 +166,10 @@
                     <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>