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

[smartthings-infrastructure.git] / EnergyMeter / EnergyMeters.groovy

diff --git a/EnergyMeter/EnergyMeters.groovy b/EnergyMeter/EnergyMeters.groovy
index a3f2b8dff1409b68958ad937d738dc69e3099585..85544953c2c05aa20996d6e0aee4bf89fef1ec48 100644 (file)
--- a/EnergyMeter/EnergyMeters.groovy
+++ b/EnergyMeter/EnergyMeters.groovy
@@ -22,10 +22,17 @@ public class EnergyMeters {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.energyMeters = []
+<<<<<<< HEAD
 
                def init = Verify.getIntFromList(30, 50, 70)
                this.energy = init
 
+=======
+               
+               def init = Verify.getIntFromList(30, 50, 70)
+               this.energy = init
+               
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
                energyMeters.add(new EnergyMeter(id, label, displayName, this.energy))
        }