Remove extraneous merge conflict marker.
authorPaul Varner <fuzzyray@gentoo.org>
Thu, 6 Jan 2011 21:29:22 +0000 (15:29 -0600)
committerPaul Varner <fuzzyray@gentoo.org>
Thu, 6 Jan 2011 21:29:22 +0000 (15:29 -0600)
commit011173cb22d6df31985c4239970b03bde00d1fcb
tree9258637ea1bf38d558a0ebbba7e2f114c19920b6
parent8dd84876ff2ec924390ac98284273e154f5fb339
Remove extraneous merge conflict marker.
man/equery.1