pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/config.mak.in b/config.mak.in
index 67b12f73a1bb795207082973701ece8009167f1c..6008ac9f1b8d056e522d5fe83c8d56bff314ca92 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -56,5 +56,4 @@ NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
 FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@
 SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
 NO_PTHREADS=@NO_PTHREADS@
-THREADED_DELTA_SEARCH=@THREADED_DELTA_SEARCH@
 PTHREAD_LIBS=@PTHREAD_LIBS@