[PATCH][TRIVIAL] Correct a typo in NEWS

[John Arbash Meinel]

Goffredo Baroncelli wrote:
> Hi all,
> 
> 
> in the NEWS file, there is a result of an /incorrect/ merge. In fact there are 
> lines as :
> 
> <<<<<<< TREE
> [...]
> =======
> [....]
>>>>>>>> MERGE-SOURCE
> 
> On the basis of the annotate of the NEWS file the typo appeared in the 
> revision robertc at robertcollins.net-20061016091447-db8b4e07ba1dc204
> 
> The patch is trivial, please review it for the 0.12 inclusion
> 
> Thank you
> Goffredo
> 
> 

Thanks for the heads up. However, this doesn't seem to be the right
place for the NEWS entry. The 'generate_revnos' parameter was done as
part of the dotted revno changes, which has only been merged into bzr
0.12 not bzr 0.11. So the *reason* it conflicted, was because it was
trying to add it to an old section (apparently the work was started
before 0.10 was released).

Anyway, I fixed it up to put it in the right location, and remove the
conflict markers.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: news_cleanup.diff
Type: text/x-patch
Size: 1562 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061023/f4470b55/attachment.bin 
-------------- 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/f4470b55/attachment.pgp