Fixing conflicting files.
[smartthings-infrastructure.git] / TemperatureMeasurement / TemperatureMeasurements.groovy
index 20d1f5a..31ba842 100644 (file)
@@ -15,12 +15,8 @@ public class TemperatureMeasurements {
        private String label = "temperatureMeasurement0"
        private String displayName = "temperatureMeasurement0"
        private int temperature = 50
-<<<<<<< HEAD
        private int currentTemperature = 50
 
-=======
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
-       
        TemperatureMeasurements(Closure sendEvent, int deviceNumbers) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers