From: Paul Varner <fuzzyray@gentoo.org>
Date: Thu, 6 Jan 2011 21:29:22 +0000 (-0600)
Subject: Remove extraneous merge conflict marker.
X-Git-Tag: gentoolkit-0.3.0~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=011173cb22d6df31985c4239970b03bde00d1fcb;p=gentoolkit.git

Remove extraneous merge conflict marker.
---

diff --git a/man/equery.1 b/man/equery.1
index 8538005..e818f71 100644
--- a/man/equery.1
+++ b/man/equery.1
@@ -451,7 +451,6 @@ The fourth field, after the colon, is the package's slot. \fB0\fP is the default
 \fBNote:\fP Because it takes extra processing time to determine the location, mask status and slot, you can speed up output by passing the \fB\-\-quiet\fP global option to \fBequery\fP when you don't care about the extra information. 
 
 \fBNote:\fP Additionally, when using \-\-quiet, if no matches are found, instead of printing an error, the equery list module will return with an exit value of 3.
->>>>>>> 61db505... Add gentoolkitNonZeroExit exception
 
 .P
 .I R "EXAMPLES" ":"