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 /balloons | |
| parent | 6399802ed76a89c5b8640f7e0853d59b8fec995c (diff) | |
| parent | e23628daf99f3ef1f6031284844bfb5474159b00 (diff) | |
| download | ponysay-351c7debb7506a17928244e9ecbb757d87b9d86f.tar.gz ponysay-351c7debb7506a17928244e9ecbb757d87b9d86f.tar.bz2 ponysay-351c7debb7506a17928244e9ecbb757d87b9d86f.zip | |
conflict resolve
Diffstat (limited to 'balloons')
| -rw-r--r-- | balloons/cowsay.say | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/balloons/cowsay.say b/balloons/cowsay.say index bb486db..51942fa 100644 --- a/balloons/cowsay.say +++ b/balloons/cowsay.say @@ -6,7 +6,7 @@ s:- w:| e: | -ww:< +ww:< ee: > nw: _ |