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

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

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