diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
| commit | 5eb9ea76e2b0aa72c1bd00d7f0429cb0de3bb1da (patch) | |
| tree | 13cae60ce6fc9da6d413d0caa445759b221f3d7a /sw/inc/pch | |
| parent | 0fe045d9566b66b766a8dd967e65ad6d57d78e5b (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sw/inc/pch')
| -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" |