Fix merge of configure

configure

@@ -6379,8 +6379,6 @@ $as_echo "#define USE_PYTHON 1" >>confdefs.h
 
 fi
 
-<<<<<<< HEAD
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjansson" >&5
 $as_echo_n "checking for libjansson... " >&6; }
 # Check whether --enable-json was given.
@@ -6501,9 +6499,6 @@ $as_echo "#define USE_JSON 1" >>confdefs.h
 
 fi
 
-=======
->>>>>>> 1b3cdff3fde9a12d9251fa388fc86a94a905db2a
-
 #check for custom prog name
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking progname" >&5
 $as_echo_n "checking progname... " >&6; }