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

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

diff --git a/eventSimulator/smokeCarbonMonoxideTestedEvent.groovy b/eventSimulator/smokeCarbonMonoxideTestedEvent.groovy
index 0c6e18e5dd3371283eea9c2c06660b34e7111130..04b1805ec7e63a9cb17e7a2a6c43e325166bea3f 100644 (file)
--- a/eventSimulator/smokeCarbonMonoxideTestedEvent.groovy
+++ b/eventSimulator/smokeCarbonMonoxideTestedEvent.groovy
@@ -1,2 +1,6 @@
                        smokeDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "",
+<<<<<<< HEAD
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+=======
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c