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

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

diff --git a/eventSimulator/accelerationActiveEvent.groovy b/eventSimulator/accelerationActiveEvent.groovy
index b7fa4d91002da46afefe900b27c3449cf84a9d40..06ec00bb3c909a38f3ea9840bb3c9dde7349677e 100644 (file)
--- a/eventSimulator/accelerationActiveEvent.groovy
+++ b/eventSimulator/accelerationActiveEvent.groovy
@@ -1,2 +1,6 @@
                        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