widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Error merging this proposal:

Output:
stdout:

stderr:
+N  data/images/wui/editor/editor_menu_tool_resize.png
+N  data/images/wui/editor/fsel_editor_resize.png
+N  src/editor/tools/resize_tool.cc
+N  src/editor/tools/resize_tool.h
+N  src/editor/ui_menus/tool_resize_options_menu.cc
+N  src/editor/ui_menus/tool_resize_options_menu.h
 M  src/editor/CMakeLists.txt
 M  src/editor/editorinteractive.cc
 M  src/editor/editorinteractive.h
 M  src/editor/tools/action_args.h
 M  src/editor/tools/history.cc
 M  src/editor/ui_menus/main_menu_new_map.cc
 M  src/editor/ui_menus/main_menu_new_map.h
 M  src/editor/ui_menus/main_menu_random_map.cc
 M  src/editor/ui_menus/main_menu_random_map.h
 M  src/editor/ui_menus/tool_menu.cc
 M  src/logic/map.cc
 M  src/logic/map.h
Text conflict in src/editor/ui_menus/tool_menu.cc
1 conflicts encountered.


-- 
https://code.launchpad.net/~widelands-dev/widelands/editor-resize-map/+merge/365638
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor-resize-map.