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

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

diff --git a/eventSimulator/hueChangedEvent.groovy b/eventSimulator/hueChangedEvent.groovy
index b5d20d2fd9650c4a772ab10eff1e25e1794f6962..de7e537e8185dc8c5d9267b9a1ad5d9961addf82 100644 (file)
--- a/eventSimulator/hueChangedEvent.groovy
+++ b/eventSimulator/hueChangedEvent.groovy
@@ -1,2 +1,6 @@
                        colorControlObject.setValue([name: "hue", 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