Postgres Pro
Downloads
Home   >   mailing lists

pgsql: Remove leftover conflict marker - Mailing list pgsql-committers

From Peter Eisentraut
Subject pgsql: Remove leftover conflict marker
Date
Msg-id E1lpPHD-0006Qo-BK@gemulon.postgresql.org
Whole thread Raw
List pgsql-committers
Tree view 
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(-)

pgsql-committers by date:

Previous
From: Peter Eisentraut
Date:
Subject: pgsql: Fix subtransaction test for Python 3.10
Next
From: Peter Eisentraut
Date:
Subject: pgsql: gitattributes: Add new entry to silence whitespace error