widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Error merging this proposal:

Output:
stdout:

stderr:
 M  src/editor/editorinteractive.cc
 M  src/editor/editorinteractive.h
 M  src/editor/ui_menus/player_menu.cc
 M  src/map_io/CMakeLists.txt
 M  src/map_io/map_building_packet.cc
 M  src/wui/fieldaction.cc
 M  src/wui/interactive_base.h
Text conflict in src/editor/editorinteractive.h
1 conflicts encountered.


-- 
https://code.launchpad.net/~widelands-dev/widelands/remove_reference_player_tribe/+merge/329898
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_reference_player_tribe.