Обсуждение: pgsql: Remove leftover conflict marker

Remove leftover conflict marker

Branch
------
REL_12_STABLE

Details
-------
https://git.postgresql.org/pg/commitdiff/89f49cc3ad404c8bd6bdb7a4f30473948e581c34

Modified Files
--------------
src/backend/access/transam/twophase.c | 1 -
1 file changed, 1 deletion(-)