merge conflicts resolved

This commit is contained in:
Enno Rehling 2018-11-03 15:49:52 +01:00
commit 2b478731c3

View file

@ -27,6 +27,7 @@ end
local function tunnel_action(b, param)
local units = tunnel_travelers(b)
local rto = get_target(param)
print("tunnel from " .. tostring(b.region) .. " to " .. tostring(rto))
if rto and units then
eressea.log.debug("Tunnel from " .. tostring(b) .. " [" .. param .. "]")
for key, u in pairs(units) do