widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Error merging this proposal:

Output:
stdout:

stderr:
+N  src/logic/generic_save_handler.cc
+N  src/logic/generic_save_handler.h
 M  src/editor/CMakeLists.txt
 M  src/editor/ui_menus/main_menu_save_map.cc
 M  src/logic/CMakeLists.txt
 M  src/logic/filesystem_constants.h
 M  src/logic/save_handler.cc
 M  src/logic/save_handler.h
 M  src/wlapplication.cc
 M  src/wlapplication.h
 M  src/wui/CMakeLists.txt
 M  src/wui/game_main_menu_save_game.cc
 M  src/wui/game_main_menu_save_game.h
Text conflict in src/wlapplication.cc
1 conflicts encountered.


-- 
https://code.launchpad.net/~widelands-dev/widelands/robust-file-saving/+merge/358718
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/robust-file-saving.