I resolved the conflicts in https://code.edge.launchpad.net/~mbp/bzr/integration/+merge/38166 and I'll let you know if there are any errors.
« Back to merge proposal
I resolved the conflicts in /code.edge. launchpad. net/~mbp/ bzr/integration /+merge/ 38166 and
https:/
I'll let you know if there are any errors.