> BTW you can get rid of the merge conflict if you run utils/fix_lua_tabs.py
I currently have no conflicts on local repo. Should I first merge trunk or run this python script? -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
