ekiga r5888 - in trunk: . lib/engine/presence/skel

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Jan  8 09:20:42 2008
New Revision: 5888
URL: http://svn.gnome.org/viewvc/ekiga?rev=5888&view=rev

Log:
Fixed merge issue.

Modified:
   trunk/ChangeLog
   trunk/lib/engine/presence/skel/presence-core.h

Modified: trunk/lib/engine/presence/skel/presence-core.h
==============================================================================
--- trunk/lib/engine/presence/skel/presence-core.h	(original)
+++ trunk/lib/engine/presence/skel/presence-core.h	Tue Jan  8 09:20:42 2008
@@ -262,10 +262,7 @@
 
     std::set<PresencePublisher *> presence_publishers;
 
-    /* help decide whether an uri is supported by runtime */
-=======
     /*** API to control which uri are supported by runtime ***/
->>>>>>> Commented the presence stack:lib/engine/presence/skel/presence-core.h
   public:
 
     /** Decides whether an uri is supported by the PresenceCore