← Back to team overview

widelands-dev team mailing list archive

Thread
Date

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

To: mp+351880@xxxxxxxxxxxxxxxxxx
From: kaputtnik <somal@xxxxxxxx>
Date: Wed, 28 Aug 2019 20:03:56 -0000
In-reply-to: <154281764179.15875.12113359089605057340.launchpad@ackee.canonical.com>
Reply-to: mp+351880@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

I get some text conflicts when merging trunk. Benedikt, can look into this and make the call for merging?
-- 
https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry.

References

[Merge] lp:~widelands-dev/widelands/ferry into lp:widelands
From: Benedikt Straub, 2018-11-21