Skip to content

Remove merge marker and address config error of ness_alarm #8125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabaff merged 1 commit into from
Jan 10, 2019
Merged

Remove merge marker and address config error of ness_alarm #8125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions source/_components/ness_alarm.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,9 @@ port:
required: true
type: integer
zones:
<<<<<<< HEAD
description: List of zones to add
=======
description: List of zones to add
>>>>>>> current
required: false
type: [integer, list]
type: list
keys:
zone_id:
description: ID of the zone on the alarm system (i.e Zone 1 -> Zone 16).
Expand All @@ -76,8 +72,4 @@ zones:
required: false
default: motion
type: string
<<<<<<< HEAD
{% endconfiguration %}
=======
{% endconfiguration %}
>>>>>>> current