From f342c20b917ec65f3b653d820fbac7a54d336919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Mon, 10 May 2021 08:53:52 +0000 Subject: [PATCH] Fix merge mistake --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index a933478..b3ea658 100644 --- a/README.md +++ b/README.md @@ -403,12 +403,8 @@ service: service_data: ``` -<<<<<<< HEAD -This works exactly like a `call_service` tap_action, but if `service_data` contains the parameter `deviceID` and that contains the word `this`, that will be replaced with the current device's deviceID. -======= -This works exactly like a `call_service` tap_action, but if `service_data` contains the parameter `deviceID` and that contains the word `this`, that will be replaced with the current deviced deviceID. ->>>>>>> Code linting +This works exactly like a `call_service` tap_action, but if `service_data` contains the parameter `deviceID` and that contains the word `this`, that will be replaced with the current device's deviceID. This may be useful for e.g. calling scripts if you want to know from where it was triggered. # `browser-player` card