Fixing conflicting files.

[smartthings-infrastructure.git] / Thermostat / Thermostats.groovy

diff --git a/Thermostat/Thermostats.groovy b/Thermostat/Thermostats.groovy
index 80a643b6a5ae0be8fbdaa4961f354e617254fab2..42a8728ebaa584e942d3bd3a2520610ec4183356 100644 (file)
--- a/Thermostat/Thermostats.groovy
+++ b/Thermostat/Thermostats.groovy
@@ -99,12 +99,8 @@ public class Thermostats{
                } else {
                        this.thermostatMode = "off"
                        this.currentThermostatMode = "off"
                } else {
                        this.thermostatMode = "off"
                        this.currentThermostatMode = "off"

-<<<<<<< HEAD

                        this.thermostatLatestMode = "off"
                        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,
 
                thermostats.add(new Thermostat(sendEvent, id, label, displayName, this.temperature, this.currentCoolingSetpoint, 
                                                this.currentHeatingSetpoint, this.coolingSetpoint, this.thermostatSetpoint, this.heatingSetpoint, this.coolingSetpointRange,