projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 09d013b4917af5e518dc1e78b3250c530213d4b6..842d28bb1ee50d4a6f9361856c8f364af4061d49 100644
(file)
--- a/
eventSimulator/saturationChangedEvent.groovy
+++ b/
eventSimulator/saturationChangedEvent.groovy
@@
-1,2
+1,6
@@
colorControlObject.setValue([name: "saturation", value: "50", deviceId: "colorControlID0", descriptionText: "",
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"]])
displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c