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

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

diff --git a/eventSimulator/beaconPresentEvent.groovy b/eventSimulator/beaconPresentEvent.groovy
index 816a1299cf4f958417ae768ea40804bf626a1dfb..7ce002b05a14aab64e6f17aee81b53d854c0f8c1 100644 (file)
--- a/eventSimulator/beaconPresentEvent.groovy
+++ b/eventSimulator/beaconPresentEvent.groovy
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
                        beaconSensorObject.setValue([name: "presence", value: "present", deviceId: "beaconeSensorID0", descriptionText: "",
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"presence":"1","dni":"mobile0"}'])
+=======
+                       beaconSensorObject.setValue([name: "beacon", value: "present", deviceId: "beaconeSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c