X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-singletons.h;h=d2669ef1186194a9fb22d444b0573fbed458061d;hp=a54b0b03405e8ba3ee55400236f60612ddcfe587;hb=79acfb0d9e8e1ade6eedcc636cba74f7e9cfd939;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae

diff --git a/src/modest-singletons.h b/src/modest-singletons.h
index a54b0b0..d2669ef 100644
--- a/src/modest-singletons.h
+++ b/src/modest-singletons.h
@@ -41,12 +41,8 @@
 #include <modest-tny-platform-factory.h>
 #include "modest-plugin-factory.h"
 #include "widgets/modest-window-mgr.h"
-<<<<<<< .working
-#include <tny-stream-cache.h>
-=======
 #include "modest-protocol-registry.h"
 #include <tny-stream-cache.h>
->>>>>>> .merge-right.r5668
 
 G_BEGIN_DECLS
 
@@ -194,16 +190,6 @@ ModestMailOperationQueue* modest_singletons_get_mail_operation_queue (ModestSing
  **/
 ModestWindowMgr*          modest_singletons_get_window_mgr           (ModestSingletons *self);
 
-<<<<<<< .working
-/**
- * modest_singletons_get_images_cache:
- * @self: a #ModestSingletons
- *
- * Gets the #TnyStreamCache used to store the external images cache.
- */
-TnyStreamCache*           modest_singletons_get_images_cache         (ModestSingletons *self);
-
-=======
 /**
  * modest_singletons_get_protocol_registry:
  * @self: 
@@ -231,7 +217,6 @@ TnyStreamCache*           modest_singletons_get_images_cache         (ModestSing
  */
 ModestPluginFactory*           modest_singletons_get_plugin_factory         (ModestSingletons *self);
 
->>>>>>> .merge-right.r5668
 G_END_DECLS
 
 #endif /* __MODEST_SINGLETONS_H__ */