← Back to team overview

widelands-dev team mailing list archive

Thread
Date

Re: [Merge] lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands

To: mp+280192@xxxxxxxxxxxxxxxxxx
From: GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>
Date: Sat, 12 Dec 2015 09:33:44 -0000
In-reply-to: <20151210201824.4261.11450.launchpad@ackee.canonical.com>
Reply-to: mp+280192@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

I have just seen that the merge conflict isn't because of indentation at all, but because we renamed the AI levels in trunk.
-- 
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.

References

[Merge] lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands
From: TiborB, 2015-12-10