Skip to content

Remove merge marker and address config error of ness_alarm#8125

Merged
fabaff merged 1 commit into
home-assistant:nextfrom
nickw444:nwhyte/ness-alarm-fix
Jan 10, 2019
Merged

Remove merge marker and address config error of ness_alarm#8125
fabaff merged 1 commit into
home-assistant:nextfrom
nickw444:nwhyte/ness-alarm-fix

Conversation

@nickw444
Copy link
Copy Markdown
Contributor

Description:
Address retrospective review comments in: #7630

Checklist:

  • Branch: next is for changes and new documentation that will go public with the next home-assistant release. Fixes, changes and adjustments for the current release should be created against current.
  • The documentation follows the standards.

@ghost ghost added the to-do label Jan 10, 2019
@nickw444 nickw444 changed the base branch from current to next January 10, 2019 20:51
@nickw444 nickw444 changed the title Nwhyte/ness alarm fix ness_alarm: Remove merge marker and address config error Jan 10, 2019
@fabaff fabaff changed the title ness_alarm: Remove merge marker and address config error Remove merge marker and address config error of ness_alarm Jan 10, 2019
Copy link
Copy Markdown
Member

@fabaff fabaff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 🐦

@fabaff fabaff merged commit 0756114 into home-assistant:next Jan 10, 2019
@ghost ghost removed the to-do label Jan 10, 2019
@frenck frenck added the next This PR goes into the next branch label Jan 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

next This PR goes into the next branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants