[issue483] zsh-lovers: diff conflict markers removed

[Michael Prokop]

Michael Prokop <mika at grml.org> added the comment:

Thanks, looks like I missed that. Applying and upload will follow.

regards,
-mika-

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

_____________________________________
GRML issue tracker <bts at bts.grml.org>
<http://bts.grml.org/grml/issue483>
_____________________________________