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

---
 tasmota/xdrv_39_thermostat.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_39_thermostat.ino b/tasmota/xdrv_39_thermostat.ino
index d822a0564..b6783fd6c 100644
--- a/tasmota/xdrv_39_thermostat.ino
+++ b/tasmota/xdrv_39_thermostat.ino
@@ -502,7 +502,7 @@ void ThermostatCalculatePI()
     }
   } 
   // If target value has not been reached
-  // AND we are within the histeresis
+  // AND we are withinvr the histeresis
   // AND gradient is positive
   // then set value to 0
   else if ((Thermostat.temp_pi_error > 0)