@Jelmer: the conflicts don't help here can you update that branch ?
Also, is there some bits waiting from https://code.edge.launchpad.net/~jelmer/bzr/colo-urls/+merge/20860 and should we wait for Robert here too or can this be reviewed independently ?
« Back to merge proposal
@Jelmer: the conflicts don't help here can you update that branch ?
Also, is there some bits waiting from https:/ /code.edge. launchpad. net/~jelmer/ bzr/colo- urls/+merge/ 20860 and should we wait for Robert here too or can this be reviewed independently ?