diff options
Diffstat (limited to 'svl/source/misc/lngmisc.cxx')
| -rw-r--r--[-rwxr-xr-x] | svl/source/misc/lngmisc.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index 488e317c6f58..c0866b21e785 100755..100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.cxx @@ -27,8 +27,12 @@ // 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> |