Bunnybot encountered an error while working on this merge proposal: Running 'bzr merge ../_widelands_dev_widelands_remove_update' failed. Output:
M src/editor/ui_menus/editor_tool_menu.cc M src/graphic/graphic.cc M src/graphic/graphic.h M src/logic/map_objects/tribes/production_program.cc M src/ui_basic/button.cc M src/ui_basic/checkbox.cc M src/ui_basic/editbox.cc M src/ui_basic/icon.cc M src/ui_basic/listselect.cc M src/ui_basic/multilineeditbox.cc M src/ui_basic/multilinetextarea.cc M src/ui_basic/panel.cc M src/ui_basic/panel.h M src/ui_basic/progressbar.cc M src/ui_basic/progresswindow.cc M src/ui_basic/scrollbar.cc M src/ui_basic/slider.cc M src/ui_basic/table.cc M src/ui_basic/tabpanel.cc M src/ui_basic/textarea.cc M src/ui_basic/window.cc M src/wui/game_message_menu.cc M src/wui/game_summary.cc M src/wui/game_tips.cc M src/wui/interactive_base.cc M src/wui/itemwaresdisplay.cc M src/wui/mapview.cc M src/wui/minimap.cc M src/wui/productionsitewindow.cc M src/wui/soldierlist.cc M src/wui/waresdisplay.cc M src/wui/waresdisplay.h M src/wui/waresqueuedisplay.cc M src/wui/waresqueuedisplay.h Text conflict in src/ui_basic/editbox.cc 1 conflicts encountered. -- https://code.launchpad.net/~widelands-dev/widelands/remove_update/+merge/284524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_update. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
