← Back to team overview

widelands-dev team mailing list archive

Thread
Date

Re: [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands

To: mp+366614@xxxxxxxxxxxxxxxxxx
From: kaputtnik <somal@xxxxxxxx>
Date: Mon, 20 May 2019 16:40:29 -0000
In-reply-to: <155644484170.15631.1515514599277309442.launchpad@ackee.canonical.com>
Reply-to: mp+366614@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

hm, there is now a text conflict shown...

Text conflict in data/tribes/workers/frisians/soldier/init.lua


-- 
https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands.

References

[Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
From: GunChleoc, 2019-04-28