Fixed conflicts.

[rsync-patches.git] / congestion.diff

diff --git a/congestion.diff b/congestion.diff
index 658df06785356772eb45b4c9ec1e5e81cad5f37d..72b19300f3f036a55b9dcfeacec0f891db51ec56 100644 (file)
--- a/congestion.diff
+++ b/congestion.diff
@@ -27,7 +27,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: db5bfe67a5d022f9ad25340db6bc2cca2cbbdb65
+based-on: 8b1b81e054bdcc927ff26f20f424e034bd273175
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt