Infrastructure that works for all the locks' group!

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

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