widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

Mmh.. but it seems like the merge conflicts are not gone. If I do a 

bzr merge lp:widelands 

I still get tons of merge conflicts. We need to resolve those, otherwise we will not be able to merge on wed. Can you have another look?
-- 
https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands.