--- Amaya/configure.in	2002/06/03 09:23:26	1.90
+++ Amaya/configure.in	2002/06/03 13:44:41	1.91
@@ -745,6 +745,17 @@ fi
 dnl
 dnl Annotation thread support enabled by default
 dnl
+<<<<<<< configure.in
+dnl if test "$with_annot_threads" = "" ; then
+dnl     if test "$enable_annot_threads" = "no" ; then
+dnl 	with_annot_threads="no"
+dnl 	ANNOT_THREAD_OPTIONS=
+dnl     else
+dnl 	with_annot_threads="yes"
+dnl 	ANNOT_THREAD_OPTIONS=-DANNOT_ON_ANNOT 
+dnl     fi
+dnl fi
+=======
 if test "$with_annot_threads" = "" ; then
     if test "$enable_annot_threads" = "no" ; then
 	with_annot_threads="no"
@@ -754,6 +765,7 @@ if test "$with_annot_threads" = "" ; the
 	ANNOT_THREAD_OPTIONS=
     fi
 fi
+>>>>>>> 1.89
 
 AC_ARG_WITH(dav,            [  --with-dav             enable WebDAV support (experimental) ])
 dnl