Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

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

diff --git a/Thermostat/Thermostats.groovy b/Thermostat/Thermostats.groovy
index 19f5d6f696ef3f2c486412a8e9c97be7c3430045..d77af21e2a2d2cfe8095c53092df97abd594e7cb 100644 (file)
--- a/Thermostat/Thermostats.groovy
+++ b/Thermostat/Thermostats.groovy
@@ -50,7 +50,11 @@ public class Thermostats{
                this.heatingSetpoint = initHeatingSetpoint
                
                def initThermostatSetpoint = Verify.getIntFromList(50, 60, 70)
+<<<<<<< HEAD
                this.thermostatSetpoint = initThermostatSetpoint
+=======
+               this.currentHeatingSetpoint = initThermostatSetpoint
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
                
                def initFanMode = Verify.getInt(0,4)
                if (initFanMode == 0) {