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. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
