X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=eventSimulator%2FcarbonMonoxideDetectedEvent.groovy;fp=eventSimulator%2FcarbonMonoxideDetectedEvent.groovy;h=5a3464ccac67eb4b385aad0442edaeb69f6a8345;hp=98f57a6d1cd3cb93f69a3f47572dcb703470e4fb;hb=d00fd74ad7e497d6849c284c6ba69db2d3ec8e65;hpb=e378d6a65b25030f8914dc97f04b81ddff351d9c

diff --git a/eventSimulator/carbonMonoxideDetectedEvent.groovy b/eventSimulator/carbonMonoxideDetectedEvent.groovy
index 98f57a6..5a3464c 100644
--- 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