Add changes in events

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

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