Code review comment for lp:~widelands-dev/widelands/bug-1696063-editor-save-map

Revision history for this message
bunnybot (widelandsofficial) wrote :

Error merging this proposal:

Output:
stdout:

stderr:
 M src/editor/ui_menus/main_menu_save_map.cc
 M src/editor/ui_menus/main_menu_save_map.h
 M src/ui_basic/table.cc
 M src/ui_basic/table.h
 M src/wui/game_main_menu_save_game.cc
 M src/wui/game_main_menu_save_game.h
Text conflict in src/editor/ui_menus/main_menu_save_map.cc
1 conflicts encountered.

« Back to merge proposal