← Back to team overview

widelands-dev team mailing list archive

Thread
Date

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

To: mp+366623@xxxxxxxxxxxxxxxxxx
From: GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 16 May 2019 23:10:53 -0000
In-reply-to: <155647075993.18301.9576246451883611651.launchpad@ackee.canonical.com>
Reply-to: mp+366623@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Because Nordfriese hadn't merged trunk after the latest merges and there was a conflict.

He's done so now, so let's have it :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/overlapping_workareas/+merge/366623
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/overlapping_workareas.

References

[Merge] lp:~widelands-dev/widelands/overlapping_workareas into lp:widelands
From: Benedikt Straub, 2019-04-28