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

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

diff --git a/eventSimulator/colorChangedEvent.groovy b/eventSimulator/colorChangedEvent.groovy
index 5ed3b4f34a12a520223b3bef7b1f5f642fbb5e7e..598e011d40cc2b40847d9049620f72d1e02870d9 100644 (file)
--- a/eventSimulator/colorChangedEvent.groovy
+++ b/eventSimulator/colorChangedEvent.groovy
@@ -1,2 +1,6 @@
                        colorControlObject.setValue([name: "color", value: "red", deviceId: "colorControlID0", descriptionText: "",
+<<<<<<< HEAD
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+=======
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c