29 Oct
2014
29 Oct
'14
11:10 p.m.
With Bryce's permission, I have merged the experimental branch into trunk.
Trunk is now open for development. Please do not make further commits to experimental.
If you do not use a separate directory for build and source:
$ bzr pull lp:inkscape
…
Conflict: can't delete src/dialogs because it is not empty. Not deleting. 1 conflicts encountered. Now on revision 13641. $ rm -rf src/dialogs $ bzr revert
This should fix your local copy.