diff options
Diffstat (limited to 'sw/inc/pch/precompiled_sw.hxx')
| -rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index c137892db46c..fd7f3b135365 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -920,12 +920,8 @@ #include "vcl/group.hxx" #include "vcl/help.hxx" #include "vcl/image.hxx" -<<<<<<< local #include "vcl/button.hxx" #include "vcl/imgcons.hxx" -======= -#include "vcl/imagebtn.hxx" ->>>>>>> other #include "vcl/inputctx.hxx" #include "vcl/jobset.hxx" #include "vcl/keycod.hxx" |