← Back to team overview

widelands-dev team mailing list archive

Thread
Date

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

To: mp+310813@xxxxxxxxxxxxxxxxxx
From: kaputtnik <somal@xxxxxxxx>
Date: Tue, 15 Nov 2016 23:00:31 -0000
In-reply-to: <20161114213622.29536.2584.launchpad@ackee.canonical.com>
Reply-to: mp+310813@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Related to your code comment: Yes it was a failure during the conflict resolving.

Merged and deployed. Hopefully all is working now...
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/auto_one_to_one_ractivating/+merge/310813
Your team Widelands Developers is subscribed to branch lp:widelands-website.

References

[Merge] lp:~widelands-dev/widelands-website/auto_one_to_one_ractivating into lp:widelands-website
From: kaputtnik, 2016-11-14