From e1d65dad8fb4ae9b26e5427f7a1a75b62be5ce17 Mon Sep 17 00:00:00 2001
From: Vincent Castellano <surye80@gmail.com>
Date: Fri, 15 May 2015 09:26:45 -0700
Subject: [PATCH] Fix merge of configure

---
 configure | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/configure b/configure
index 90b847d..1408bc9 100755
--- a/configure
+++ b/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; }