From 9e4a0404aebd39791f140618f57a75de9f91ed3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Dec 2017 13:33:41 +0100 Subject: [PATCH] Fix merge conflict --- source/_components/alarm_control_panel.arlo.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/source/_components/alarm_control_panel.arlo.markdown b/source/_components/alarm_control_panel.arlo.markdown index 62f2d2a612a..19294db81b1 100644 --- a/source/_components/alarm_control_panel.arlo.markdown +++ b/source/_components/alarm_control_panel.arlo.markdown @@ -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). +