Skip to content

C
core
Kaydet (Commit) fecd6bc2 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Remove merge junk 

Change-Id: I291baa1e78d0033d242b407f96f37cdbab9fe62b
üst d42500f1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
desktop/source/app/app.cxx
Dosyayı görüntüle @ fecd6bc2
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment