Error merging this proposal: Output: stdout:
stderr: M data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua M data/campaigns/tutorial04_economy.wmf/scripting/texts.lua M src/editor/editorinteractive.cc M src/editor/ui_menus/main_menu_load_map.cc M src/editor/ui_menus/main_menu_map_options.cc M src/editor/ui_menus/main_menu_random_map.cc M src/editor/ui_menus/main_menu_save_map.cc M src/editor/ui_menus/tool_change_height_options_menu.cc M src/editor/ui_menus/tool_change_resources_options_menu.cc M src/editor/ui_menus/tool_noise_height_options_menu.cc M src/logic/replay_game_controller.cc M src/ui_basic/button.h M src/ui_basic/checkbox.h M src/ui_basic/dropdown.h M src/ui_basic/editbox.h M src/ui_basic/listselect.h M src/ui_basic/messagebox.h M src/ui_basic/multilineeditbox.h M src/ui_basic/radiobutton.h M src/ui_basic/slider.h M src/ui_basic/spinbox.h M src/ui_basic/table.h M src/ui_basic/tabpanel.h M src/ui_basic/window.h M src/ui_fsmenu/internet_lobby.cc M src/ui_fsmenu/launch_mpg.cc M src/ui_fsmenu/options.cc M src/wlapplication.cc M src/wui/building_statistics_menu.cc M src/wui/game_options_sound_menu.cc M src/wui/game_statistics_menu.cc M src/wui/interactive_player.cc M src/wui/interactive_spectator.cc M src/wui/load_or_save_game.cc M src/wui/shipwindow.cc M src/wui/soldierlist.cc M src/wui/ware_statistics_menu.cc Text conflict in src/ui_fsmenu/internet_lobby.cc 1 conflicts encountered. -- https://code.launchpad.net/~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height/+merge/335130 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
