diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-10-25 00:16:00 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-10-25 00:16:00 +0200 |
| commit | 351c7debb7506a17928244e9ecbb757d87b9d86f (patch) | |
| tree | 1c9c6eb2b53ff47e94fef37459bd2b14220abf04 /manuals/manpage.0 | |
| parent | 6399802ed76a89c5b8640f7e0853d59b8fec995c (diff) | |
| parent | e23628daf99f3ef1f6031284844bfb5474159b00 (diff) | |
| download | ponysay-351c7debb7506a17928244e9ecbb757d87b9d86f.tar.gz ponysay-351c7debb7506a17928244e9ecbb757d87b9d86f.tar.bz2 ponysay-351c7debb7506a17928244e9ecbb757d87b9d86f.zip | |
conflict resolve
Diffstat (limited to 'manuals/manpage.0')
| -rw-r--r-- | manuals/manpage.0 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manuals/manpage.0 b/manuals/manpage.0 index 9627f62..5407e2c 100644 --- a/manuals/manpage.0 +++ b/manuals/manpage.0 @@ -76,8 +76,8 @@ multiple times, and one of the will be selected randomly. .B \-q, \-\-quote [\fIname\fP...] By using this option, a pony will be printed with quotes from her in My Little Pony: Friendship is Magic. The pony will be selected randomly, unless at least one pony -is added as an argument after \fI-q\fP. If one or more ponies are added after \fI-q\fP -the pony will be selected randomly from that set of ponies. +is added as an argument to \fI-q\fP. If one or more ponies are added as an argument +to \fI-q\fP the pony will be selected randomly from that set of ponies. .TP .B \-W, \-\-wrap \fIcolumn\fP The screen column where the message should be wrapped. |