diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-20 08:43:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-20 08:43:22 +0100 |
| commit | fecd6bc21dca9d2eb04cb7bc0463e571bdf72ab3 (patch) | |
| tree | a76d6f294e3974cf1adad9b2ba1ed535d5c23557 /desktop/source | |
| parent | d42500f1f0a980273e919d1c61ce32e97757daaf (diff) | |
Remove merge junk
Change-Id: I291baa1e78d0033d242b407f96f37cdbab9fe62b
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/app.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index bc6667b47cdf..622f5ae123d6 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -95,11 +95,6 @@ #include "langselect.hxx" -#include "com/sun/star/deployment/ExtensionManager.hpp" -#include "com/sun/star/deployment/XExtensionManager.hpp" -#include "com/sun/star/task/XInteractionApprove.hpp" -#include "cppuhelper/compbase3.hxx" - #ifdef ENABLE_TELEPATHY #include <tubes/manager.hxx> #endif |