pgsql: Remove leftover conflict marker

From: Peter Eisentraut <peter(at)eisentraut(dot)org>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Remove leftover conflict marker
Date: 2021-06-05 05:55:19
Message-ID: E1lpPHD-0006Qo-BK@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

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(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Peter Eisentraut 2021-06-05 05:58:12 pgsql: gitattributes: Add new entry to silence whitespace error
Previous Message Peter Eisentraut 2021-06-05 05:26:23 pgsql: Fix subtransaction test for Python 3.10