From 0bc0bd07d41169d6de513967615ad9cb3d0f322e Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 8 Feb 2011 16:22:20 -0500
Subject: [PATCH] Fix merge conflict.

---
 src/test/regress/expected/sanity_check.out | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index 59e1bdb807..ab9e891788 100644
--- 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
-- 
GitLab