[GNUnet-SVN] r11786 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2010-06-17 17:43:40 +0200 (Thu, 17 Jun 2010)
New Revision: 11786

Modified:
   gnunet/src/testing/testing_group.c
Log:
resolve merge conflict

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2010-06-17 15:32:43 UTC (rev 11785)
+++ gnunet/src/testing/testing_group.c  2010-06-17 15:43:40 UTC (rev 11786)
@@ -1872,17 +1872,7 @@
   struct GNUNET_TESTING_PeerGroup *pg = cls;
   outstanding_connects--;
 
-<<<<<<< .mine
   pg->notify_connection(pg->notify_connection_cls, first, second, distance, 
first_cfg, second_cfg, first_daemon, second_daemon, emsg);
-=======
-  pg->notify_connection(pg->notify_connection_cls, 
-                       first,
-                       second, 
-                       first_cfg, second_cfg, 
-                       first_daemon, second_daemon, 
-                       emsg);
->>>>>>> .r11782
-
 }