widelands-dev team mailing list archive

Thread
Date

[Merge] lp:~widelands-dev/widelands/bug-1696063-editor-save-map into lp:widelands

To: mp+345375@xxxxxxxxxxxxxxxxxx
From: bunnybot <widelandsofficial@xxxxxxxxx>
Date: Mon, 21 May 2018 07:42:15 -0000
In-reply-to: <152597283464.19154.13094267292817321278.launchpad@ackee.canonical.com>
Reply-to: mp+345375@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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.


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

References

[Merge] lp:~widelands-dev/widelands/bug-1696063-editor-save-map into lp:widelands
From: GunChleoc, 2018-05-10