From: Pavan Deolasee <pavan.deolasee@gmail.com>
Date: Thu, 18 Feb 2016 10:20:10 +0000 (+0530)
Subject: Remove some leftover merge-conflicts markers
X-Git-Tag: XL9_5_R1BETA1~5
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=b6ff4b0aeb3c39211f857a87278ce09ab9f45fdf;p=postgres-xl.git

Remove some leftover merge-conflicts markers
---

diff --git a/configure b/configure
index 5ac6d221df..6f18d85183 100755
--- a/configure
+++ b/configure
@@ -1614,11 +1614,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-<<<<<<< HEAD
-PostgreSQL configure 9.5beta1 (Postgres-XL 9.5beta1)
-=======
-PostgreSQL configure 9.5.0
->>>>>>> cdd4ed5449bf317cc71b45a8deee0173822e7592
+PostgreSQL configure 9.5.0 (Postgres-XL 9.5beta1)
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2329,11 +2325,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-<<<<<<< HEAD
-It was created by PostgreSQL $as_me 9.5beta1 (Postgres-XL 9.5beta1), which was
-=======
-It was created by PostgreSQL $as_me 9.5.0, which was
->>>>>>> cdd4ed5449bf317cc71b45a8deee0173822e7592
+It was created by PostgreSQL $as_me 9.5.0 (Postgres-XL 9.5beta1), which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -16200,11 +16192,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="
-<<<<<<< HEAD
-This file was extended by PostgreSQL $as_me 9.5beta1 (Postgres-XL 9.5beta1), which was
-=======
-This file was extended by PostgreSQL $as_me 9.5.0, which was
->>>>>>> cdd4ed5449bf317cc71b45a8deee0173822e7592
+This file was extended by PostgreSQL $as_me 9.5.0 (Postgres-XL 9.5beta1), which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES