From be1d71cb6c60d87aae921b40f8172279592592c9 Mon Sep 17 00:00:00 2001 From: BillyS Date: Fri, 7 Dec 2018 17:08:09 +0000 Subject: [PATCH] Removed merge markup --- mods/utils/settings.lua | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mods/utils/settings.lua b/mods/utils/settings.lua index 14d2a86..c8cbe20 100644 --- a/mods/utils/settings.lua +++ b/mods/utils/settings.lua @@ -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, ",")