Fix merge conflict.

This commit is contained in:
Tom Lane 2011-02-08 16:22:20 -05:00
parent d9572c4e3b
commit 0bc0bd07d4

View File

@ -157,7 +157,7 @@ SELECT relname, relhasindex
timetz_tbl | f timetz_tbl | f
tinterval_tbl | f tinterval_tbl | f
varchar_tbl | f varchar_tbl | f
(145 rows) (146 rows)
-- --
-- another sanity check: every system catalog that has OIDs should have -- another sanity check: every system catalog that has OIDs should have