]> git.ipfire.org Git - thirdparty/postgresql.git/commit
Remove leftover conflict marker
authorPeter Eisentraut <peter@eisentraut.org>
Sat, 5 Jun 2021 05:32:29 +0000 (07:32 +0200)
committerPeter Eisentraut <peter@eisentraut.org>
Sat, 5 Jun 2021 05:32:29 +0000 (07:32 +0200)
commit89f49cc3ad404c8bd6bdb7a4f30473948e581c34
treed673f8a22f5ba0ce091d2d29de9a22f664ed1658
parent0c92ed165ec13672d615d81a5c5fb76580f92f13
Remove leftover conflict marker
src/backend/access/transam/twophase.c