resolve mergeconflicts
This commit is contained in:
commit
029ab5aa0c
488 changed files with 9848 additions and 2154 deletions
|
@ -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"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue