Fix pgpool_setup failure.

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index 24c7f7cd6f8a18f9d6037097563886b5fcafff32..a70846d64939aa02e5186eb654353b97337e3d1d 100755 (executable)
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -620,7 +620,6 @@ EOF
 
     cat > $1/$fname <<EOF
 primary_conninfo      = 'port=$BASEPORT user=$WHOAMI application_name=''server$2'''
->>>>>>> 23fb4c12... Deal with PostgreSQL 12.
 recovery_target_timeline='latest'
 EOF
     if [ $USE_REPLICATION_SLOT = true ];then