[BUG] NEWS contains conflicts markers inside

[John Arbash Meinel]

Alexander Belchenko wrote:
> There is conflict markers in file NEWS. annotate says it was introduced
> by revision from Robert Collins by 2006-10-16:
> 
> line 256: <<<<<<< TREE
> 
> line 308: =======
> 
> line 317: >>>>>>> MERGE-SOURCE
> 
> 
> Conflict in text related to 0.10 release.
> 
> -- 
> Alexander

Actually, it was because Robert merged a branch that started before 0.10
into 0.12, which caused a conflict back around the 0.10 release notes.

Anyway, I've fixed the problem. Thanks for pointing it out.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061023/964538ea/attachment.pgp