resolve merge conflict

1 files changed, 0 insertions, 10 deletions

diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index b6ae14036..98610a28b 100644
--- 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
-
 }