Hm.. looks like the branch has conflicts.
I have merged master branch into this and fix conflicts with git-bzr ... but looks like they were not applied to bzr :( just use code from latest branch as it is merged with master.
Thanks!
« Back to merge proposal
Hm.. looks like the branch has conflicts.
I have merged master branch into this and fix conflicts with git-bzr ... but looks like they were not applied to bzr :( just use code from latest branch as it is merged with master.
Thanks!