widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr merge ../_widelands_dev_widelands_ai_small_tweaks' failed. Output:

 M  src/ai/ai_help_structs.cc
 M  src/ai/ai_help_structs.h
 M  src/ai/defaultai.cc
 M  src/ai/defaultai.h
 M  src/logic/widelands_geometry.cc
 M  src/logic/widelands_geometry.h
Text conflict in src/ai/ai_help_structs.h
Text conflict in src/ai/defaultai.cc
2 conflicts encountered.

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