Build fix: reran autoconf

percona · Nov 13, 2024 · 1977259 · 1977259
1 parent f7d15b5
commit 1977259
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/configure b/configure
@@ -1693,7 +1693,6 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-<<<<<<< HEAD
 PostgreSQL configure 17.1.1
 generated by GNU Autoconf 2.69
 
@@ -19900,7 +19899,6 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-<<<<<<< HEAD
 PostgreSQL config.status 17.1.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"