pgsql: Fix merge conflict. - Mailing list pgsql-committers

From Tom Lane
Subject pgsql: Fix merge conflict.
Date
Msg-id E1Pmv1Z-00008a-8E@gemulon.postgresql.org
Whole thread Raw
List pgsql-committers
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(-)


pgsql-committers by date:

Previous
From: Peter Eisentraut
Date:
Subject: pgsql: Per-column collation support
Next
From: Tom Lane
Date:
Subject: pgsql: Core support for "extensions", which are packages of SQL objects