pgsql: Fix merge conflict.

From: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
To: pgsql-committers(at)postgresql(dot)org
Subject: pgsql: Fix merge conflict.
Date: 2011-02-08 21:23:01
Message-ID: E1Pmv1Z-00008a-8E@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: 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(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Bernd Helmle 2011-02-08 21:58:38 Re: pgsql: Extend ALTER TABLE to allow Foreign Keys to be added without ini
Previous Message Peter Eisentraut 2011-02-08 21:07:55 pgsql: Per-column collation support