resolve merge conflict

diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index b6ae14036c7508824858d08a7fcf7c8dfd1c0c7b..98610a28b0f7a6c065ff8c9811e1c9b52e51269d 100644 (file)
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -1872,17 +1872,7 @@ static void internal_connect_notify (void *cls,
   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
-
 }