diff options
author | Bart Polot <bart@net.in.tum.de> | 2015-01-15 13:58:12 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2015-01-15 13:58:12 +0000 |
commit | 9a422930cd63c70030f02db5d12659849c05dd31 (patch) | |
tree | 5d84bc0c4ae795de53dd9ff89d309c15257cf9fb /src/cadet | |
parent | bf3e3ff8a9f52868d0e567153f1a84dd7b8c4b0d (diff) | |
download | gnunet-9a422930cd63c70030f02db5d12659849c05dd31.tar.gz gnunet-9a422930cd63c70030f02db5d12659849c05dd31.zip |
- fix failed git merge
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/test_cadet.c | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ | |||
34 | * How namy messages to send | 34 | * How namy messages to send |
35 | */ | 35 | */ |
36 | #define TOTAL_PACKETS 2000 | 36 | #define TOTAL_PACKETS 2000 |
37 | #define TOTAL_PACKETS 20000 | ||
38 | 37 | ||
39 | /** | 38 | /** |
40 | * How long until we give up on connecting the peers? | 39 | * How long until we give up on connecting the peers? |