Can you propose that other branch for merging once you are ready? Only then can we know if the diff is correct or if bzr is still confused. -- https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/scheduling into lp:widelands-website.
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
