From bbb4fbd24b697a57c04c39e0eeee74df40f49dfe Mon Sep 17 00:00:00 2001
From: Javier Arigita <arigita@gmail.com>
Date: Thu, 23 Apr 2020 22:49:16 +0200
Subject: [PATCH] Fix merge

---
 tasmota/xdrv_39_thermostat.ino | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tasmota/xdrv_39_thermostat.ino b/tasmota/xdrv_39_thermostat.ino
index 5d871ac63..01545aaa3 100644
--- a/tasmota/xdrv_39_thermostat.ino
+++ b/tasmota/xdrv_39_thermostat.ino
@@ -502,8 +502,12 @@ void ThermostatCalculatePI()
     }
   } 
   // If target value has not been reached
+<<<<<<< HEAD
 <<<<<<< HEAD
   // AND we are within the histeresis
+=======
+  // AND we are withinvr the histeresis
+>>>>>>> new_branch_dev
 =======
   // AND we are withinvr the histeresis
 >>>>>>> new_branch_dev
@@ -710,7 +714,7 @@ void ThermostatWork()
       }
       else {
         Thermostat.status.command_output = IFACE_OFF;
-      }
+      }      
       break;
   }
   bool output_command;