* Lots of build fixes due to a very bad commit with the merge not

[modest] / src / modest-runtime.h

diff --git a/src/modest-runtime.h b/src/modest-runtime.h
index 0d45ae0..c2177d8 100644 (file)
--- a/src/modest-runtime.h
+++ b/src/modest-runtime.h
@@ -42,13 +42,9 @@
 #include <modest-signal-mgr.h>
 #include <tny-platform-factory.h>
 #include "widgets/modest-window-mgr.h"
-<<<<<<< .working
-#include <tny-stream-cache.h>
-=======
 #include <modest-protocol-registry.h>
 #include <tny-stream-cache.h>
 #include <modest-plugin-factory.h>
->>>>>>> .merge-right.r5668
 
 G_BEGIN_DECLS