spot fix remove merge conflict artifact

2018-12-21 15:56:26 +00:00 · 2018-12-21 15:56:26 +00:00 · e074fd76d8
parent 9b61affa10
commit e074fd76d8
1 changed files with 0 additions and 3 deletions
--- a/nssm_materials.lua
+++ b/nssm_materials.lua
@ -591,8 +591,6 @@ minetest.register_abm({
 		end
 })

-<<<<<<< HEAD
-=======
 --tools

 minetest.register_tool('nssm:sun_sword', {
@ -1644,7 +1642,6 @@ minetest.register_craft({
 	type = "shapeless",
 	recipe = {'nssm:sun_feather','nssm:night_feather'}
 })
->>>>>>> 8d4795a3e1da0b5ee801ac1f3eff38083434aa02

 --Eggs