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

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

diff --git a/eventSimulator/carbonMonoxideDetectedEvent.groovy b/eventSimulator/carbonMonoxideDetectedEvent.groovy
index 6686f9112272f23c0babafb30ca70990e10cc9b7..5a3464ccac67eb4b385aad0442edaeb69f6a8345 100644 (file)
--- a/eventSimulator/carbonMonoxideDetectedEvent.groovy
+++ b/eventSimulator/carbonMonoxideDetectedEvent.groovy
@@ -1,2 +1,6 @@
                        carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
+<<<<<<< HEAD
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+=======
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c