Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bad merge, forgot the lua files.

This commit is contained in:
Enno Rehling 2016-02-21 13:18:17 +01:00
parent 4bf282bdd7
commit a6b39d6fb7
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/tests/e3/rules.lua
View File

@ -929,7 +929,6 @@ function test_volcanooutbreak_message()
assert_not_equal("", msg:render("en"))
end
<<<<<<< HEAD
function test_bug2083()
local herb_multi = 500 -- from rc_herb_trade()
local r = region.create(0,0,"plain")
@ -962,13 +961,7 @@ function test_bug2083()
assert_equal(0, u:get_item("balm"))
end
=======
>>>>>>> release-3.7.11
function test_no_uruk()
local f1 = faction.create("noreply@eressea.de", "uruk", "de")
assert_equal(f1.race, "orc")
end
<<<<<<< HEAD
=======
>>>>>>> release-3.7.11