Error merging this proposal: Output: stdout:
stderr: M src/ai/ai_help_structs.h M src/logic/campaign_visibility.cc M src/map_io/map_players_view_packet.cc M src/network/internet_gaming.cc M src/wui/interactive_base.cc Text conflict in src/network/internet_gaming.cc 1 conflicts encountered. -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_201804/+merge/344800 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_201804. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
