I see, that probably confused bzr into thinking that there are conflicts. One of the correct procedures would be to branch freshly from recent 2.0 and make your changes - this might come handy in the future, as Alexey said he will take care of this MP.
I see, that probably confused bzr into thinking that there are conflicts. One of the correct procedures would be to branch freshly from recent 2.0 and make your changes - this might come handy in the future, as Alexey said he will take care of this MP.
Thanks for working on this.