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

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

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