Fix build

Change-Id: Ia38f9a66c5743b524e84887e5dc23535710f2db6
2020-02-20 19:17:39 +01:00
parent a7be9479a0
commit d7cab304e7
1 changed files with 0 additions and 4 deletions
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -381,11 +381,7 @@
          </packing>
        </child>
        <child>
-<<<<<<< HEAD   (aad94d Silence warnings in salvtables.hxx)
-          <object class="GtkBox" id="box4">
-=======
          <object class="GtkBox" id="indentfieldbox">
->>>>>>> CHANGE (8b9246 sidebar: provide indent field boxes with useful id for hidin)
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>