Fix patch conflict.

diff --git a/db.diff b/db.diff
index fa7791e6628e9d72168112b0df6dde6594f645a6..11114604a690c100cda059926b4ca185fdcb3c24 100644 (file)
--- a/db.diff
+++ b/db.diff
@@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 9f9240b661c5f381831b62d72b6ea928a91ff43a
+based-on: f4c3969b63013efbff55b890aa1f25a680e4ebb4
 diff --git a/.gitignore b/.gitignore
 --- a/.gitignore
 +++ b/.gitignore
@@ -120,7 +120,7 @@ diff --git a/Makefile.in b/Makefile.in
  clean: cleantests
 -      rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
 +      rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) rsyncdb$(EXEEXT) \
-               rounding rounding.h *.old rsync*.1 rsync*.5 rsync*.html \
+               git-version.h rounding rounding.h *.old rsync*.1 rsync*.5 rsync*.html \
                daemon-parm.h help-*.h default-*.h proto.h proto.h-tstamp
  
 diff --git a/checksum.c b/checksum.c
@@ -3213,4 +3213,4 @@ diff --git a/usage.c b/usage.c
 +
  const char *rsync_version(void)
  {
-       return RSYNC_GITVER;
+ #ifdef RSYNC_GITVER