Remove leftover conflict marker

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 4d4396e8f17ae55c81782738c874fa0983d972a3..6add9871ff8ffba904162831727ee4941dcc6e80 100644 (file)
--- 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)