BTS

Issue483

Title zsh-lovers: diff conflict markers removed
Priority bug Status resolved
Superseder Nosy List maddi, mika, z3ttacht
Assigned To Topics manpage, zsh

Created on 2008-06-24.16:29:27 by z3ttacht, last changed 2009-01-29.16:16:02 by mika.

Files
File name Uploaded Type Edit Remove
zsh-lovers.diff z3ttacht, 2008-06-24.16:29:26 text/x-diff
Messages
msg1770 (view) Author: mika Date: 2009-01-29.16:16:01
We believe that your issue has been closed by the upload of
Version 0.8.2 of zsh-lovers from Michael Prokop <mika@grml.org>.
The explanation is attached below

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Thu, 29 Jan 2009 16:58:43 +0100
Source: zsh-lovers
Binary: zsh-lovers
Architecture: source all
Version: 0.8.2
Distribution: unstable
Urgency: low
Maintainer: Michael Prokop <mika@grml.org>
Changed-By: Michael Prokop <mika@grml.org>
Description: 
 zsh-lovers - tips, tricks and examples for the zsh
Changes: 
 zsh-lovers (0.8.2) unstable; urgency=low
 .
   * Drop some left over merge crap.
   * Deleted trailing whitespace as well as incorporated some
     punctuation characters, thanks, z3ttacht. [Closes: issue483]
Checksums-Sha1: 
 72e30c3cadb006887e0abda7ea89b13734f12a4e 863 zsh-lovers_0.8.2.dsc
 a1d907f2421a9fa45ff296bdc2c432c21ab81619 876255 zsh-lovers_0.8.2.tar.gz
 e2128752dbb09a15f67be3b4110a9a1a66d2a55f 973738 zsh-lovers_0.8.2_all.deb
Checksums-Sha256: 
 101c2ab5e1c68150bc826784f4e2c4ff9068cc2794bd07a021a3041f51e29e2c 863 zsh-lovers_0.8.2.dsc
 d92f4a267facf6787987aa9e06cdea790f811011070390143e31e09742408321 876255 zsh-lovers_0.8.2.tar.gz
 850206ef477e5e9836a64fce2b5c8b3d5b9cd3005541cda6db1556e338368d32 973738 zsh-lovers_0.8.2_all.deb
Files: 
 7b60574d688b7ea286b501591fdbd445 863 doc optional zsh-lovers_0.8.2.dsc
 2dcae808a7018a727d3c62d5613fe844 876255 doc optional zsh-lovers_0.8.2.tar.gz
 2d83f4ddd52b9613974772dc82725cbd 973738 doc optional zsh-lovers_0.8.2_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iD8DBQFJgdLV2N9T+zficugRAvrXAJ4lLYxJOv+l8LjdcYLKfPjnrK1tJwCfRJAi
Dbgw7powkzQJCLtd7CPK9rg=
=KKic
-----END PGP SIGNATURE-----
msg1768 (view) Author: mika Date: 2009-01-29.15:58:38
Thanks, looks like I missed that. Applying and upload will follow.

regards,
-mika-
msg1767 (view) Author: z3ttacht Date: 2009-01-29.15:30:06
Has this issue just been missed. Or are there any problems regarding
the patch?
msg1356 (view) Author: z3ttacht Date: 2008-06-24.16:29:26
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.
History
Date User Action Args
2009-01-29 16:16:02mikasetstatus: in-progress -> resolved
nosy: mika, maddi, z3ttacht
messages: + msg1770
2009-01-29 15:58:39mikasetstatus: chatting -> in-progress
nosy: mika, maddi, z3ttacht
messages: + msg1768
2009-01-29 15:30:07z3ttachtsetstatus: unread -> chatting
nosy: mika, maddi, z3ttacht
messages: + msg1767
2008-06-24 16:29:27z3ttachtcreate