Fix merge conflict

This commit is contained in:
An0n3m0us 2019-08-20 15:40:34 +01:00
parent 57c6d19efa
commit edfdf2c9e8

View file

@ -755,17 +755,18 @@ minetest.register_craft({
})
minetest.register_craft({
output = 'default:snowblock',
output = "default:snowblock",
recipe = {
{'default:snow', 'default:snow'},
{'default:snow', 'default:snow'},
{"default:snow", "default:snow", "default:snow"},
{"default:snow", "default:snow", "default:snow"},
{"default:snow", "default:snow", "default:snow"},
}
})
minetest.register_craft({
output = 'default:snow 4',
output = "default:snow 9",
recipe = {
{'default:snowblock'},
{"default:snowblock"},
}
})