From 559003a4944031ea6795532e09c84c67322099b6 Mon Sep 17 00:00:00 2001
From: Ombridride <quentinbd@gmail.com>
Date: Sat, 15 Nov 2014 00:50:53 +0100
Subject: [PATCH] Trolol lolol lololol

---
 minetestforfun_game/mods/default/crafting.lua | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua
index 0c5c5d81..d8f233af 100644
--- a/minetestforfun_game/mods/default/crafting.lua
+++ b/minetestforfun_game/mods/default/crafting.lua
@@ -505,11 +505,6 @@ minetest.register_craft({
 	recipe = {{"default:bronzeblock"},}
 })
 
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 6af63a7e5d47ce158443a7a59da2954f046f7129
 minetest.register_craft({
 	output = "default:goldblock",
 	recipe = {