X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=eventSimulator%2FsaturationChangedEvent.groovy;fp=eventSimulator%2FsaturationChangedEvent.groovy;h=842d28bb1ee50d4a6f9361856c8f364af4061d49;hp=09d013b4917af5e518dc1e78b3250c530213d4b6;hb=d00fd74ad7e497d6849c284c6ba69db2d3ec8e65;hpb=e378d6a65b25030f8914dc97f04b81ddff351d9c

diff --git a/eventSimulator/saturationChangedEvent.groovy b/eventSimulator/saturationChangedEvent.groovy
index 09d013b..842d28b 100644
--- 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