From 197725950c5a063f737962cabb5518c8ac3d04b2 Mon Sep 17 00:00:00 2001
From: Zsolt Parragi <zsolt.parragi@cancellar.hu>
Date: Fri, 27 Sep 2024 11:08:50 +0100
Subject: [PATCH] Build fix: reran autoconf

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

diff --git a/configure b/configure
index 3cf9307013733..c110b725a2e5a 100755
--- 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\\"