Infrastructure that works for all the locks' group!

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

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