From 011173cb22d6df31985c4239970b03bde00d1fcb Mon Sep 17 00:00:00 2001 From: Paul Varner Date: Thu, 6 Jan 2011 15:29:22 -0600 Subject: [PATCH] Remove extraneous merge conflict marker. --- man/equery.1 | 1 - 1 file changed, 1 deletion(-) 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" ":" -- 2.26.2