diff options
Diffstat (limited to 'sw/inc/pch/precompiled_sw.hxx')
| -rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index fd7f3b135365..c137892db46c 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -920,8 +920,12 @@ #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" |