From: Tom Lane Date: Tue, 8 Feb 2011 21:22:20 +0000 (-0500) Subject: Fix merge conflict. X-Git-Tag: REL9_1_ALPHA4~239 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bc0bd07d41169d6de513967615ad9cb3d0f322e;p=postgresql Fix merge conflict. --- diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out index 59e1bdb807..ab9e891788 100644 --- a/src/test/regress/expected/sanity_check.out +++ b/src/test/regress/expected/sanity_check.out @@ -157,7 +157,7 @@ SELECT relname, relhasindex timetz_tbl | f tinterval_tbl | f varchar_tbl | f -(145 rows) +(146 rows) -- -- another sanity check: every system catalog that has OIDs should have