[MERGE] Use locations.conf instead of branches.conf

[Robert Collins]

On Fri, 2006-06-16 at 12:33 -0400, Aaron Bentley wrote:
> 
> I agree about the need for consensus.  I've previously discussed this
> with Martin and Robert, and they were fine with it.  But I can wait
> and
> see if they've had second thoughts. 

None here.

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060617/046e7ee5/attachment.pgp