mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge

This commit is contained in:
Javier Arigita 2020-04-23 22:49:16 +02:00
parent 7c336a1105
commit bbb4fbd24b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/xdrv_39_thermostat.ino
View File

@ -502,8 +502,12 @@ void ThermostatCalculatePI()
} }
} }
// If target value has not been reached // If target value has not been reached
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// AND we are within the histeresis // AND we are within the histeresis
=======
// AND we are withinvr the histeresis
>>>>>>> new_branch_dev
======= =======
// AND we are withinvr the histeresis // AND we are withinvr the histeresis
>>>>>>> new_branch_dev >>>>>>> new_branch_dev