← Back to team overview

widelands-dev team mailing list archive

Thread
Date

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

To: mp+280352@xxxxxxxxxxxxxxxxxx
From: TiborB <tiborb95@xxxxxxxxx>
Date: Tue, 29 Dec 2015 19:40:34 -0000
In-reply-to: <20151211201724.30424.10196.launchpad@ackee.canonical.com>
Reply-to: mp+280352@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

When merging trunk here I got:
Warning: criss-cross merge encountered.  See bzr help criss-cross.
....
Text conflict in src/ui_basic/spinbox.cc
1 conflicts encountered.  

Is it safe to proceed?
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-536409/+merge/280352
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_new_map.

References

[Merge] lp:~widelands-dev/widelands/bug-536409 into lp:widelands
From: GunChleoc, 2015-12-11