From 0cbc98900a5609d108c1af6ce22a22137ddcb4e2 Mon Sep 17 00:00:00 2001
From: sys4 <bricassa@sys4.fr>
Date: Mon, 15 Mar 2021 21:02:18 +0100
Subject: [PATCH] Fix a merge error

---
 init.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.lua b/init.lua
index ed580b6..0664f06 100644
--- a/init.lua
+++ b/init.lua
@@ -2879,7 +2879,6 @@ else
 			return itemstack
 		end
 	})
->>>>>>> upstream/master
 end
 
 minetest.register_node("witchcraft:potion_magenta", {