jeans/home-assistant.io
jeans/home-assistant.io
1
0
Fork 0
mirror of https://github.com/home-assistant/home-assistant.io.git synced 2025-07-23 17:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ness_alarm: Remove merge marker and address config error (#8125)

Browse Source
This commit is contained in:
Nick Whyte 2019-01-11 09:13:42 +11:00 committed by Fabian Affolter
parent 46020fbb58
commit 07561145be
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/_components/ness_alarm.markdown
View File

@ -55,13 +55,9 @@ port:
required: true required: true
type: integer type: integer
zones: zones:
<<<<<<< HEAD
description: List of zones to add description: List of zones to add
=======
description: List of zones to add
>>>>>>> current
required: false required: false
type: [integer, list] type: list
keys: keys:
zone_id: zone_id:
description: ID of the zone on the alarm system (i.e Zone 1 -> Zone 16). description: ID of the zone on the alarm system (i.e Zone 1 -> Zone 16).
@ -76,8 +72,4 @@ zones:
required: false required: false
default: motion default: motion
type: string type: string
<<<<<<< HEAD
{% endconfiguration %} {% endconfiguration %}
=======
{% endconfiguration %}
>>>>>>> current