widelands-dev team mailing list archive

Thread
Date

[Merge] lp:~widelands-dev/widelands/map_hint_space into lp:widelands

To: mp+285407@xxxxxxxxxxxxxxxxxx
From: bunnybot <widelandsofficial@xxxxxxxxx>
Date: Sat, 13 Feb 2016 12:03:15 -0000
In-reply-to: <20160208204039.11879.85546.launchpad@ackee.canonical.com>
Reply-to: mp+285407@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr merge ../_widelands_dev_widelands_map_hint_space' failed. Output:

 M  src/ui_basic/multilinetextarea.cc
 M  src/ui_basic/multilinetextarea.h
 M  src/wui/mapdetails.cc
Text conflict in src/ui_basic/multilinetextarea.cc
1 conflicts encountered.

-- 
https://code.launchpad.net/~widelands-dev/widelands/map_hint_space/+merge/285407
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_hint_space.

References

[Merge] lp:~widelands-dev/widelands/map_hint_space into lp:widelands
From: GunChleoc, 2016-02-08