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

[smartthings-infrastructure.git] / DoorControl / DoorControls.groovy

diff --git a/DoorControl/DoorControls.groovy b/DoorControl/DoorControls.groovy
index 25818009adfd0ba480940322ed19e9fc60713c61..e8e067a5e7966060e586e2b6a65f07374fc2f72b 100644 (file)
--- a/DoorControl/DoorControls.groovy
+++ b/DoorControl/DoorControls.groovy
@@ -23,7 +23,11 @@ public class DoorControls {
                this.timers = new SimulatedTimer()
                this.deviceNumbers = deviceNumbers
                this.doorControls = []
+<<<<<<< HEAD
                
+=======
+
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
                def init = Verify.getBoolean()
                if (init) {
                        this.doorState = "closed"