diff options
| author | Tom Lane | 2011-02-08 21:22:20 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-02-08 21:22:20 +0000 |
| commit | 0bc0bd07d41169d6de513967615ad9cb3d0f322e (patch) | |
| tree | 0f64c9f43a8228d8348ebcfa6a4bef46e0d4ae19 /src | |
| parent | d9572c4e3b474031060189050e14ef384b94e001 (diff) | |
Fix merge conflict.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/expected/sanity_check.out | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out index 59e1bdb8070..ab9e8917887 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 |