From 88dcd91052411e795aa50366a4a7bc583ca72bba Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Thu, 17 Jun 2010 15:43:40 +0000 Subject: [PATCH] resolve merge conflict --- src/testing/testing_group.c | 10 ---------- 1 file changed, 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 - } -- 2.25.1