widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Error merging this proposal:

Output:
stdout:

stderr:
 M  data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/smokery/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua
 M  data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua
 M  data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua
 M  data/tribes/buildings/productionsites/barbarians/big_inn/init.lua
 M  data/tribes/buildings/productionsites/barbarians/coalmine/init.lua
 M  data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua
 M  data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua
 M  data/tribes/buildings/productionsites/barbarians/goldmine/init.lua
 M  data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua
 M  data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua
 M  data/tribes/buildings/productionsites/barbarians/granitemine/init.lua
 M  data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua
 M  data/tribes/buildings/productionsites/barbarians/inn/init.lua
 M  data/tribes/buildings/productionsites/barbarians/ironmine/init.lua
 M  data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua
 M  data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua
 M  data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua
 M  data/tribes/buildings/productionsites/barbarians/tavern/init.lua
 M  data/tribes/buildings/productionsites/barbarians/warmill/init.lua
 M  data/tribes/buildings/productionsites/empire/armorsmithy/init.lua
 M  data/tribes/buildings/productionsites/empire/coalmine/init.lua
 M  data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua
 M  data/tribes/buildings/productionsites/empire/goldmine/init.lua
 M  data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua
 M  data/tribes/buildings/productionsites/empire/inn/init.lua
 M  data/tribes/buildings/productionsites/empire/ironmine/init.lua
 M  data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua
 M  data/tribes/buildings/productionsites/empire/marblemine/init.lua
 M  data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua
 M  data/tribes/buildings/productionsites/empire/smelting_works/init.lua
 M  data/tribes/buildings/productionsites/empire/tavern/init.lua
 M  data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua
 M  data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua
 M  data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua
 M  data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua
 M  data/tribes/buildings/productionsites/frisians/coalmine/init.lua
 M  data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua
 M  data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua
 M  data/tribes/buildings/productionsites/frisians/furnace/init.lua
 M  data/tribes/buildings/productionsites/frisians/goldmine/init.lua
 M  data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua
 M  data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua
 M  data/tribes/buildings/productionsites/frisians/ironmine/init.lua
 M  data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua
 M  data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua
 M  data/tribes/buildings/productionsites/frisians/recycling_center/init.lua
 M  data/tribes/buildings/productionsites/frisians/rockmine/init.lua
 M  data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua
 M  data/tribes/buildings/productionsites/frisians/sewing_room/init.lua
 M  data/tribes/buildings/productionsites/frisians/smokery/init.lua
 M  data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua
 M  data/tribes/buildings/productionsites/frisians/tavern/init.lua
 M  data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua
 M  data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua
 M  data/tribes/buildings/trainingsites/empire/arena/init.lua
 M  data/tribes/buildings/trainingsites/empire/colosseum/init.lua
 M  data/tribes/buildings/trainingsites/frisians/training_arena/init.lua
 M  data/tribes/scripting/help/ware_help.lua
 M  data/txts/developers.json
 M  src/logic/map_objects/tribes/production_program.cc
 M  src/logic/map_objects/tribes/worker.cc
Text conflict in data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua
Text conflict in data/tribes/buildings/productionsites/barbarians/big_inn/init.lua
Text conflict in data/tribes/buildings/productionsites/empire/armorsmithy/init.lua
Text conflict in data/tribes/buildings/productionsites/empire/marblemine/init.lua
4 conflicts encountered.


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