Fix merge conflict.

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index 59e1bdb8070340e9143300789536227fa73097d9..ab9e89178878d2925e7498bcaefe591afe2309fb 100644 (file)
--- 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