diff options
| author | Paul Varner <fuzzyray@gentoo.org> | 2011-01-06 15:29:22 -0600 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2011-01-06 15:29:22 -0600 |
| commit | 011173cb22d6df31985c4239970b03bde00d1fcb (patch) | |
| tree | 9258637ea1bf38d558a0ebbba7e2f114c19920b6 /man | |
| parent | 8dd84876ff2ec924390ac98284273e154f5fb339 (diff) | |
| download | gentoolkit-011173cb22d6df31985c4239970b03bde00d1fcb.tar.gz | |
Remove extraneous merge conflict marker.
Diffstat (limited to 'man')
| -rw-r--r-- | man/equery.1 | 1 |
1 files changed, 0 insertions, 1 deletions
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" ":" |