5 files changed, 7 insertions, 11 deletions

diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
index 0776dace..851f23cc 100644
--- a/doc/libmicrohttpd.texi
+++ b/doc/libmicrohttpd.texi
@@ -277,7 +277,7 @@ do not include epoll support, even if it supported (minimally smaller binary siz
 @item ``--enable-coverage''
 set flags for analysis of code-coverage with gcc/gcov (results in slow, large binaries)
 
-@item ``--with-threads={posix,w32,none,auto}''
+@item ``--with-threads=posix,w32,none,auto''
 sets threading library to use. With use ``none'' to not support threads. In this case, MHD will only support the ``external'' threading modes and not perform any locking of data structures! Use @code{MHD_is_feature_supported(MHD_FEATURE_THREADS)} to test if threads are available. Default is ``auto''.
 
 @item ``--with-gcrypt=PATH''
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 926a983e..2c162def 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5745,12 +5745,8 @@ MHD_start_daemon_va (unsigned int flags,
 #endif
 #endif
 
-<<<<<<< HEAD
   /* Thread pooling currently works only with internal select thread mode */
-=======
-  /* Thread pooling currently works only with internal select thread model */
 #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
->>>>>>> add build option to compile MHD without threads
   if ( (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) &&
         (daemon->worker_pool_size > 0) )
     {
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 3e703772..e564241c 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -82,11 +82,11 @@ endif
 endif
 
 if USE_POSIX_THREADS
-check_PROGRAMS +=
+check_PROGRAMS += \
   $(THREAD_ONLY_TESTS)
 endif
 if USE_W32_THREADS
-check_PROGRAMS +=
+check_PROGRAMS += \
   $(THREAD_ONLY_TESTS)
 endif
 
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 7454ab06..2ea8e2d7 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -38,11 +38,11 @@ check_PROGRAMS = \
   test_https_get_select 
 
 if USE_POSIX_THREADS
-check_PROGRAMS +=
+check_PROGRAMS += \
   $(THREAD_ONLY_TESTS)
 endif
 if USE_W32_THREADS
-check_PROGRAMS +=
+check_PROGRAMS += \
   $(THREAD_ONLY_TESTS)
 endif
 
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index be31bad2..cb776891 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -29,11 +29,11 @@ check_PROGRAMS = \
   test_put_large11 
 
 if USE_POSIX_THREADS
-check_PROGRAMS +=
+check_PROGRAMS += \
   $(THREAD_ONLY_TESTS)
 endif
 if USE_W32_THREADS
-check_PROGRAMS +=
+check_PROGRAMS += \
   $(THREAD_ONLY_TESTS)
 endif