[Libreoffice-commits] core.git: svx/uiconfig

[Szymon KÅ‚os (via logerrit)]

 svx/uiconfig/ui/sidebarparagraph.ui |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit d7cab304e7dd22fd12443a1ee3b6a9c463bf9a3d
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Feb 20 19:17:39 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Feb 20 19:17:39 2020 +0100

    Fix build
    
    Change-Id: Ia38f9a66c5743b524e84887e5dc23535710f2db6

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 6433ab60612c..ce0b0dda1379 100644
--- 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>