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(-) -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
