widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

That depends on the conflict and how well you know the code you're working on.

If you haven't defined these functions yet, you could copy over the code from this branch.

Let me know if you need help.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1298301/+merge/236966
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1298301 into lp:widelands.