mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build

Browse Source 
Change-Id: Ia38f9a66c5743b524e84887e5dc23535710f2db6
This commit is contained in:
Szymon Kłos
2020-02-20 19:17:39 +01:00
parent a7be9479a0
commit d7cab304e7
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
svx/uiconfig/ui/sidebarparagraph.ui
View File

@@ -381,11 +381,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<<<<<<< HEAD (aad94d Silence warnings in salvtables.hxx)
<object class="GtkBox" id="box4">
=======
<object class="GtkBox" id="indentfieldbox"> <object class="GtkBox" id="indentfieldbox">
>>>>>>> CHANGE (8b9246 sidebar: provide indent field boxes with useful id for hidin)
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>