It looks like meitis accidentally tried to merge lp:widelands into his own branch (instead of the other way round). I deleted this proposal (the branch has been merged correctly some time ago), so everything should be fine now.
It looks like meitis accidentally tried to merge lp:widelands into his own branch (instead of the other way round). I deleted this proposal (the branch has been merged correctly some time ago), so everything should be fine now.