From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 8 Feb 2011 21:22:20 +0000 (-0500)
Subject: Fix merge conflict.
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=0bc0bd07d41169d6de513967615ad9cb3d0f322e;p=users%2Fhanada%2Fpostgres.git

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