So you stick with kalendae, no problem. Please merge the latest changes from trunk into your branch. In the directory of your branch:
bzr merge lp:widelands-website bzr commit -m "merged with trunk" -- https://code.launchpad.net/~trimardio/widelands-website/scheduling_module/+merge/331477 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/scheduling_module 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
