Infrastructure that works for all the locks' group!

[smartthings-infrastructure.git] / eventSimulator / accelerationInactiveEvent.groovy

diff --git a/eventSimulator/accelerationInactiveEvent.groovy b/eventSimulator/accelerationInactiveEvent.groovy
index 2e5b6728f36a24fd9d90f494fc3d24030d4886b0..eaa876fcd42b80cb555fda18d915f4a32f94c804 100644 (file)
--- a/eventSimulator/accelerationInactiveEvent.groovy
+++ b/eventSimulator/accelerationInactiveEvent.groovy
@@ -1,6 +1,2 @@
                        accelerationSensorObject.setValue([name: "acceleration", value: "inactive", deviceId: "accelerationSensorID0", descriptionText: "",
-<<<<<<< HEAD
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-=======
-                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c