widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Error merging this proposal:

Output:
stdout:

stderr:
 M  src/ai/ai_help_structs.cc
 M  src/ai/ai_help_structs.h
 M  src/ai/defaultai.cc
 M  src/ai/defaultai_warfare.cc
Text conflict in src/ai/ai_help_structs.h
1 conflicts encountered.


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