From bc70d2dec77e46a224c6a7005e80aeae1e28dcd1 Mon Sep 17 00:00:00 2001
From: Milan <tchncs@vivaldi.net>
Date: Wed, 17 Jan 2018 10:39:25 +0100
Subject: [PATCH] ooops

---
 mods/fire/init.lua | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mods/fire/init.lua b/mods/fire/init.lua
index 5fc51b7b..fb3aca3f 100644
--- a/mods/fire/init.lua
+++ b/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.