pgsql: Fix stupid merge errors in previous commit

From: Alvaro Herrera <alvherre(at)alvh(dot)no-ip(dot)org>
To: pgsql-committers(at)postgresql(dot)org
Subject: pgsql: Fix stupid merge errors in previous commit
Date: 2015-02-23 18:05:47
Message-ID: E1YPxO7-00086c-63@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

Fix stupid merge errors in previous commit

Brown paper bag installed permanently.

Branch
------
master

Details
-------
http://git.postgresql.org/pg/commitdiff/d1712d01d01d2c14355fad497fa7a6ae6e33694f

Modified Files
--------------
src/backend/tcop/utility.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Stefan Kaltenbrunner 2015-02-23 20:33:14 Re: pgsql: Replace checkpoint_segments with min_wal_size and max_wal_size.
Previous Message Tom Lane 2015-02-23 17:47:03 pgsql: Further tweaking of raw grammar output to distinguish different