Le 20/08/2014 15:12, Brian Sidebotham a écrit :
Hi Yann, There's nothing wrong with the source, see: http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/view/head:/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp You have a locally unresolved conflict because you've had some local changes that BZR cannot resolve without your help. See http://doc.bazaar.canonical.com/beta/en/user-guide/resolving_conflicts.html You can check the status to see the unresolved conflicts by using the bzr status command. Best Regards, Brian.
Woops. Sorry for the noise. I forgot I had previously applied Dick's patch, and that is the source of my problem. Not enough familiar with bzr...
_______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
