From: Peter Eisentraut <peter@eisentraut.org>
Date: Sat, 5 Jun 2021 05:32:29 +0000 (+0200)
Subject: Remove leftover conflict marker
X-Git-Tag: REL_12_8~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89f49cc3ad404c8bd6bdb7a4f30473948e581c34;p=thirdparty%2Fpostgresql.git

Remove leftover conflict marker
---

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 4d4396e8f17..6add9871ff8 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1381,7 +1381,6 @@ ParsePrepareRecord(uint8 info, char *xlrec, xl_xact_parsed_prepare *parsed)
  * particularly if this routine is called for the end-of-recovery checkpoint
  * in the checkpointer itself, so save the current timeline number value
  * and restore it once done.
->>>>>>> 9477be0b57 (Fix handling of end-of-recovery checkpoint with 2PC transactions)
  */
 static void
 XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)