Fix a merge error

This commit is contained in:
bri cassa 2021-03-15 21:02:18 +01:00
parent 0a06acc1d8
commit 0cbc98900a

View File

@ -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", {