Fix merge conflict.

Tom Lane <tgl@sss.pgh.pa.us>

Commit: 0bc0bd07d41169d6de513967615ad9cb3d0f322e
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: 2011-02-08T21:22:20Z
Releases: 9.1.0
Fix merge conflict.

Files

PathChange+/−
src/test/regress/expected/sanity_check.out modified +1 −1