Adding events to emulate values above and below thresholds.

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

diff --git a/eventSimulator/carbonMonoxideTestedEvent.groovy b/eventSimulator/carbonMonoxideTestedEvent.groovy
index 5a3464ccac67eb4b385aad0442edaeb69f6a8345..6686f9112272f23c0babafb30ca70990e10cc9b7 100644 (file)
--- a/eventSimulator/carbonMonoxideTestedEvent.groovy
+++ b/eventSimulator/carbonMonoxideTestedEvent.groovy
@@ -1,6 +1,2 @@
                        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