Fix merge conflict.
authorTom Lane <tgl@sss.pgh.pa.us>
Tue, 8 Feb 2011 21:22:20 +0000 (16:22 -0500)
committerTom Lane <tgl@sss.pgh.pa.us>
Tue, 8 Feb 2011 21:22:20 +0000 (16:22 -0500)
commit0bc0bd07d41169d6de513967615ad9cb3d0f322e
tree0f64c9f43a8228d8348ebcfa6a4bef46e0d4ae19
parentd9572c4e3b474031060189050e14ef384b94e001
Fix merge conflict.
src/test/regress/expected/sanity_check.out