Fixing conflicting files.
[smartthings-infrastructure.git] / Thermostat / Thermostats.groovy
index 80a643b..42a8728 100644 (file)
@@ -99,12 +99,8 @@ public class Thermostats{
                } else {
                        this.thermostatMode = "off"
                        this.currentThermostatMode = "off"
-<<<<<<< HEAD
                        this.thermostatLatestMode = "off"
-               }
-=======
                }*/
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
 
                thermostats.add(new Thermostat(sendEvent, id, label, displayName, this.temperature, this.currentCoolingSetpoint, 
                                                this.currentHeatingSetpoint, this.coolingSetpoint, this.thermostatSetpoint, this.heatingSetpoint, this.coolingSetpointRange,