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

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

diff --git a/eventSimulator/accelerationInactiveEvent.groovy b/eventSimulator/accelerationInactiveEvent.groovy
index 60c9021c62cf8759ecca85cc15403e1a4fce4d41..2e5b6728f36a24fd9d90f494fc3d24030d4886b0 100644 (file)
--- a/eventSimulator/accelerationInactiveEvent.groovy
+++ b/eventSimulator/accelerationInactiveEvent.groovy
@@ -1,2 +1,6 @@
                        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