X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-runtime.h;h=c07baf2f0febbb8014d51434563d81234c7b3249;hp=0d45ae006d7b972bbb98f1aaf58b027f47a07395;hb=510ae47c0727698808a6e440e1fe2a0901289f99;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae

diff --git a/src/modest-runtime.h b/src/modest-runtime.h
index 0d45ae0..c07baf2 100644
--- 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
 
@@ -70,7 +66,7 @@ typedef enum {
  * environment, instantiates singletons and so on)
  * modest_runtime_init should only be called once, and
  * when done with it, modest_runtime_uninit should be called
- *  
+ *
  * TRUE if this succeeded, FALSE otherwise.
  */
 gboolean modest_runtime_init (void);
@@ -85,10 +81,10 @@ gboolean modest_runtime_init (void);
  * TRUE if this succeeded, FALSE otherwise
  */
 gboolean modest_runtime_uninit (void);
-	
+
 
 /**
- * modest_runtime_get_debug_flags 
+ * modest_runtime_get_debug_flags
  *
  * get the debug flags for modest; they are read from the MODEST_DEBUG
  * environment variable; the flags specified as strings, separated by ':'.