Trolol lolol lololol

2014-11-15 00:50:53 +01:00 · 2014-11-15 00:50:53 +01:00 · 559003a494
parent 3343435f8f
commit 559003a494
1 changed files with 0 additions and 5 deletions
--- 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 = {