Fix merge conflict.

2011-02-08 16:22:20 -05:00 · 2011-02-08 16:22:20 -05:00 · 0bc0bd07d4
commit 0bc0bd07d4
parent d9572c4e3b
1 changed files with 1 additions and 1 deletions
--- 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