Some change to configure

v3l0c1r4pt0r · Jun 12, 2014 · c4a5707 · c4a5707
1 parent ca3f338
commit c4a5707
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/configure b/configure
@@ -4027,18 +4027,11 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 # AC_CONFIG_HEADERS([config.h])
-<<<<<<< HEAD
-#AM_PATH_CHECK([0.9], [], [
-#         echo "Check is required for this program"
-#         exit -1])
-=======
 #the following line not always work
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
->>>>>>> dev
-
 # Checks for programs.
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'