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

[jpuydt svn gnome org]

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

Log:
Fixed merge issue further

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:23:04 2008
@@ -249,7 +249,6 @@
 
     std::set<PresenceFetcher *> presence_fetchers;
 
-<<<<<<< HEAD:lib/engine/presence/skel/presence-core.h
     /* help publishing presence */
   public: