Fix a merge error

2021-03-15 21:02:18 +01:00 · 2021-03-15 21:02:18 +01:00 · 0cbc98900a
parent 0a06acc1d8
commit 0cbc98900a
1 changed files with 0 additions and 1 deletions
--- a/init.lua
+++ b/init.lua
@ -2879,7 +2879,6 @@ else
 			return itemstack
 		end
 	})
->>>>>>> upstream/master
 end

 minetest.register_node("witchcraft:potion_magenta", {