solve some merge problems

97c6715a · Philipp Lohmann [pl] · 626b0249 · 97c6715a
Kaydet (Commit) 97c6715a authored Ock 14, 2010 tarafından Philipp Lohmann [pl]
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

docuno.cxx sc/source/ui/unoobj/docuno.cxx +1 -1

No files found.
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -43,7 +43,7 @@
 #include <svl/numuno.hxx>
 #include <svl/smplhint.hxx>
 #include <unotools/undoopt.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/pdfextoutdevdata.hxx>