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

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

diff --git a/eventSimulator/beaconLeftEvent.groovy b/eventSimulator/beaconLeftEvent.groovy
index 445e51f7281b4f6b2add8e67125fbd5cf1677672..36f8bd8cb53f68cba7fbcd3b759b44ccf93528a9 100644 (file)
--- a/eventSimulator/beaconLeftEvent.groovy
+++ b/eventSimulator/beaconLeftEvent.groovy
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
                        beaconSensorObject.setValue([name: "presence", value: "not present", deviceId: "beaconSensorID0", descriptionText: "",
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"presence":"0","dni":"mobile0"}'])
+=======
+                       beaconSensorObject.setValue([name: "beacon", value: "not present", deviceId: "beaconSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c