From 9a422930cd63c70030f02db5d12659849c05dd31 Mon Sep 17 00:00:00 2001
From: Bart Polot <bart@net.in.tum.de>
Date: Thu, 15 Jan 2015 13:58:12 +0000
Subject: [PATCH] - fix failed git merge

---
 src/cadet/test_cadet.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index a58867c6f..aaf9c4f0c 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -34,7 +34,6 @@
  * How namy messages to send
  */
 #define TOTAL_PACKETS 2000
-#define TOTAL_PACKETS 20000
 
 /**
  * How long until we give up on connecting the peers?
-- 
2.25.1