[issue483] zsh-lovers: diff conflict markers removed

[Alexander Steinböck]

New submission from Alexander Steinböck <z3ttacht at grml.org>:

Chapter 'Modifier usage' of zsh-lovers.txt contains diff related
conflict markers, such as `<<< === >>>'. Hopefully, I've chosen the
proper parts to keep.

Besides I deleted trailing whitespace as well as incorporated some
punctuation characters above the corrected, aforementioned section.

----------
files: zsh-lovers.diff
messages: 1356
nosy: maddi, mika, z3ttacht
priority: bug
status: unread
title: zsh-lovers: diff conflict markers removed
topic: manpage, zsh

_____________________________________
GRML issue tracker <bts at bts.grml.org>
<http://bts.grml.org/grml/issue483>
_____________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: zsh-lovers.diff
Type: text/x-diff
Size: 3142 bytes
Desc: not available
Url : http://ml.grml.org/pipermail/bugs-changes/attachments/20080624/b4a23937/attachment.diff