Fix merge conflict.

tglsfdc · tglsfdc · commit 0bc0bd07d411 · 2011-02-08T16:22:20.000-05:00
diff --git 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
