diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2021-06-05 07:32:29 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2021-06-05 07:32:29 +0200 |
| commit | 89f49cc3ad404c8bd6bdb7a4f30473948e581c34 (patch) | |
| tree | d673f8a22f5ba0ce091d2d29de9a22f664ed1658 /src | |
| parent | 0c92ed165ec13672d615d81a5c5fb76580f92f13 (diff) | |
| download | postgresql-89f49cc3ad404c8bd6bdb7a4f30473948e581c34.tar.gz postgresql-89f49cc3ad404c8bd6bdb7a4f30473948e581c34.zip | |
Remove leftover conflict marker
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/transam/twophase.c | 1 |
1 files changed, 0 insertions, 1 deletions
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) |