--- libaitrpc/configure	2015/01/21 21:17:04	1.32
+++ libaitrpc/configure	2015/01/21 21:18:28	1.33
@@ -580,13 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libaitrpc'
 PACKAGE_TARNAME='libaitrpc'
-<<<<<<< configure
 PACKAGE_VERSION='8.0'
 PACKAGE_STRING='libaitrpc 8.0'
-=======
-PACKAGE_VERSION='7.2'
-PACKAGE_STRING='libaitrpc 7.2'
->>>>>>> 1.31
 PACKAGE_BUGREPORT='misho@elwix.org'
 PACKAGE_URL=''
 
@@ -1250,11 +1245,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-<<<<<<< configure
 \`configure' configures libaitrpc 8.0 to adapt to many kinds of systems.
-=======
-\`configure' configures libaitrpc 7.2 to adapt to many kinds of systems.
->>>>>>> 1.31
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1320,11 +1311,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-<<<<<<< configure
      short | recursive ) echo "Configuration of libaitrpc 8.0:";;
-=======
-     short | recursive ) echo "Configuration of libaitrpc 7.2:";;
->>>>>>> 1.31
    esac
   cat <<\_ACEOF
 
@@ -1417,11 +1404,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-<<<<<<< configure
 libaitrpc configure 8.0
-=======
-libaitrpc configure 7.2
->>>>>>> 1.31
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1974,11 +1957,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-<<<<<<< configure
 It was created by libaitrpc $as_me 8.0, which was
-=======
-It was created by libaitrpc $as_me 7.2, which was
->>>>>>> 1.31
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5166,11 +5145,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-<<<<<<< configure
 This file was extended by libaitrpc $as_me 8.0, which was
-=======
-This file was extended by libaitrpc $as_me 7.2, which was
->>>>>>> 1.31
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5232,11 +5207,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-<<<<<<< configure
 libaitrpc config.status 8.0
-=======
-libaitrpc config.status 7.2
->>>>>>> 1.31
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"