minenux/minetest-mod-nssm
minenux/minetest-mod-nssm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spot fix remove merge conflict artifact

Browse Source
This commit is contained in:
Tai Kedzierski 2018-12-21 15:56:26 +00:00
parent 9b61affa10
commit e074fd76d8
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nssm_materials.lua
View File

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