From: Nathan S. Evans <evans@in.tum.de>
Date: Thu, 17 Jun 2010 15:43:40 +0000 (+0000)
Subject: resolve merge conflict
X-Git-Tag: initial-import-from-subversion-38251~21354
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=88dcd91052411e795aa50366a4a7bc583ca72bba;p=oweals%2Fgnunet.git

resolve merge conflict
---

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
-
 }