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 | 91e34e4ccc6c61d0b64d250817af7f0d2263b89e (patch) | |
| tree | 40aada24b74a727c59941b29a8a12c3ea06f0b4f /svl/source/misc | |
| parent | e775b40a11ca0eab7964dacc8387367086e2b029 (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'svl/source/misc')
| -rw-r--r-- | svl/source/misc/lngmisc.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index c0866b21e785..1324a8fa842c 100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.cxx @@ -27,19 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -<<<<<<< local #include <svl/lngmisc.hxx> -======= - -#include <lngmisc.hxx> ->>>>>>> other #include <tools/solar.h> #include <tools/string.hxx> #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> - using namespace rtl; namespace linguistic |