ooops

mods/fire/init.lua

@@ -288,13 +288,8 @@ minetest.register_abm({
 
 
 -- Enable the following ABMs according to 'enable fire' setting
-<<<<<<< HEAD
-
-local fire_enabled = minetest.setting_getbool("enable_fire")
-=======
 --[[
 local fire_enabled = minetest.settings:get_bool("enable_fire")
->>>>>>> 2e47e09... fire: remove fire abm's, make fire nodes last 20-30 seconds
 if fire_enabled == nil then
 	-- New setting not specified, check for old setting.
 	-- If old setting is also not specified, 'not nil' is true.