Remove leftover conflict marker

Peter Eisentraut <peter@eisentraut.org>

Commit: 89f49cc3ad404c8bd6bdb7a4f30473948e581c34
Author: Peter Eisentraut <peter@eisentraut.org>
Date: 2021-06-05T05:32:29Z
Releases: 12.8
Remove leftover conflict marker

Files

PathChange+/−
src/backend/access/transam/twophase.c modified +0 −1