diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-02-20 19:17:39 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-02-20 19:17:39 +0100 |
| commit | d7cab304e7dd22fd12443a1ee3b6a9c463bf9a3d (patch) | |
| tree | 8a4ce56c4d351befe9969e88f025b09519bb3908 /svx | |
| parent | a7be9479a04de2f0059c5769bbd9dc354c84136b (diff) | |
Fix build
Change-Id: Ia38f9a66c5743b524e84887e5dc23535710f2db6
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/uiconfig/ui/sidebarparagraph.ui | 4 |
1 files changed, 0 insertions, 4 deletions
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> |