Remove extraneous merge conflict marker.

diff --git a/man/equery.1 b/man/equery.1
index 85380058b04fb0f81c4873a19d539afbf9ea51e5..e818f71b560d390fb3743bcceae5c52049268d34 100644 (file)
--- 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" ":"