Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2017-07-16 11:24:38 +02:00
commit ed4cb5324b
1 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
function nmr_check(maxnmrs) function nmr_check(maxnmrs)
local nmrs = get_nmrs(1) local nmrs = get_nmrs(1)
if nmrs >= maxnmrs then if nmrs > maxnmrs then
eressea.log.error("Shit. More than " .. maxnmrs .. " factions with 1 NMR (" .. nmrs .. ")") eressea.log.error("Shit. More than " .. maxnmrs .. " factions with 1 NMR (" .. nmrs .. ")")
write_summary() write_summary()
return -1 return -1