Infrastructure that works for all the locks' group!

[smartthings-infrastructure.git] / GlobalVariables / GlobalVariablesBothApps.groovy

diff --git a/GlobalVariables/GlobalVariablesBothApps.groovy b/GlobalVariables/GlobalVariablesBothApps.groovy
index bb45ddf6d395e20a1b966029c646e66376c102ea..998778b9380bb5611888df21ca3941a744de4056 100644 (file)
--- a/GlobalVariables/GlobalVariablesBothApps.groovy
+++ b/GlobalVariables/GlobalVariablesBothApps.groovy
@@ -8,11 +8,8 @@
 @Field def appObject = new Touched(sendEvent, 0)
 //Create a global list for events
 //@Field def evt = []
-<<<<<<< HEAD
 //Global Object for class AtomicState!
 @Field def atomicState = new AtomicState()
-=======
->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
 //Global Object for class Touch Sensor!
 @Field def touchSensorObject = new NfcTouch(sendEvent, 1)
 //Global Object for class switch!