resolve mergeconflicts

This commit is contained in:
Milan Ihl 2020-08-17 22:07:15 +02:00
commit 029ab5aa0c
488 changed files with 9848 additions and 2154 deletions

View file

@ -1,3 +1,5 @@
-- gave_initial_stuff/init.lua
local stuff_string = minetest.settings:get("initial_stuff") or
"illuna:noobcoin 42,magical_potion:fly_small 2"