pgsql: Remove leftover conflict marker

Started by Peter Eisentrautabout 5 years ago1 messagescomitters

peter_e@gmx.net

about 5 years ago

Remove leftover conflict marker

Branch
------
REL_12_STABLE

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