Fix merge mistake

This commit is contained in:
Thomas Lovén 2021-05-10 08:53:52 +00:00
parent 101cfafe14
commit f342c20b91

View File

@ -403,12 +403,8 @@ service: <service>
service_data: service_data:
<service_data> <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. 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.
>>>>>>> Code linting
This may be useful for e.g. calling scripts if you want to know from where it was triggered. This may be useful for e.g. calling scripts if you want to know from where it was triggered.
# `browser-player` card # `browser-player` card