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

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

diff --git a/eventSimulator/saturationChangedEvent.groovy b/eventSimulator/saturationChangedEvent.groovy
index 5327de2e3c42ac2c3b764af2c0a5de8ab7aea9da..842d28bb1ee50d4a6f9361856c8f364af4061d49 100644 (file)
--- a/eventSimulator/saturationChangedEvent.groovy
+++ b/eventSimulator/saturationChangedEvent.groovy
@@ -1,2 +1,6 @@
                        colorControlObject.setValue([name: "saturation", value: "50", deviceId: "colorControlID0", descriptionText: "",
+<<<<<<< HEAD
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+=======
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c