Fix merge conflict.

machack666 · Feb 8, 2011 · 0bc0bd0 · 0bc0bd0
1 parent d9572c4
commit 0bc0bd0
Showing 1 changed file with 1 addition and 1 deletion.
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