forked from mtcontrib/witchcraft
Fix a merge error
This commit is contained in:
parent
0a06acc1d8
commit
0cbc98900a
1
init.lua
1
init.lua
@ -2879,7 +2879,6 @@ else
|
|||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
>>>>>>> upstream/master
|
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_node("witchcraft:potion_magenta", {
|
minetest.register_node("witchcraft:potion_magenta", {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user