From 89f49cc3ad404c8bd6bdb7a4f30473948e581c34 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 5 Jun 2021 07:32:29 +0200 Subject: [PATCH] Remove leftover conflict marker --- src/backend/access/transam/twophase.c | 1 - 1 file changed, 1 deletion(-) 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) -- 2.39.5