Fix patch conflicts; discard md5p8.diff.

[rsync-patches.git] / checksum-xattr.diff

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index f1aad4e067a73340bca23632cc33010eaaa8b358..6a9915d2e01ed31c760f2131f6ce02464bd16100 100644 (file)
--- a/checksum-xattr.diff
+++ b/checksum-xattr.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
-based-on: cc832943160fb2cbaeaf45942b724828399edd37
+based-on: 55b2a06812e39f15f52e92b979600cb82be210cb
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c