archfan7411/kingdoms_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed merge markup

Browse Source
This commit is contained in:
BillyS 2018-12-07 17:08:09 +00:00
parent 9b61bc5fd2
commit be1d71cb6c
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mods/utils/settings.lua
View File

@ -64,11 +64,7 @@ end
-- or nil.
function settings.get_bool(name, default_value)
local value = minetest.settings:get_bool(name)
<<<<<<< HEAD
=======
>>>>>>> 316debdfa967a6285be3ddbe9c2b9ca6b114ee9e
if value ~= nil then
return value
else
@ -115,11 +111,6 @@ end
-- or nil.
function settings.get_pos2d(name, default_value)
local value = minetest.settings:get(name)
<<<<<<< HEAD
=======
>>>>>>> 316debdfa967a6285be3ddbe9c2b9ca6b114ee9e
if value ~= nil then
local splitted_value = stringutil.split(value, ",")