Fix merge conflict

This commit is contained in:
Fabian Affolter 2017-12-03 13:33:41 +01:00
parent 7fc0603f41
commit 9e4a0404ae
No known key found for this signature in database
GPG Key ID: DDF3D6F44AAB1336

View File

@ -75,3 +75,4 @@ Setting Arlo to a custom mode (mapped to `home_mode_name` in `configuration.yaml
You can also completely disarm the Arlo base station by calling the `alarm_control_panel.alarm_disarm` service, and trigger the alarm by calling the `alarm_control_panel.alarm_trigger` service.
More examples and configuration options can be found on the [Manual Alarm Control page](/components/alarm_control_panel.manual/#examples).