diff options
| -rw-r--r-- | svx/uiconfig/ui/sidebarparagraph.ui | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index 4e0a7df6836f..6433ab60612c 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -381,7 +381,11 @@ </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> |