pgsql: Fix merge conflict.
pgsql: Fix merge conflict.
От:
Tom Lane <tgl@sss.pgh.pa.us>
Дата:
Fix merge conflict. Branch ------ master Details ------- http://git.postgresql.org/gitweb?p=postgresql.git;a=commitdiff;h=0bc0bd07d41169d6de513967615ad9cb3d0f322e Modified Files -------------- src/test/regress/expected/sanity_check.out | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)