Fix merge conflict.

0bc0bd07 · Tom Lane · d9572c4e · 0bc0bd07
Commit 0bc0bd07 authored Feb 08, 2011 by Tom Lane
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/test/regress/expected/sanity_check.out src/test/regress/expected/sanity_check.out +1 -1

No files found.
--- 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