Skip to content

fix merge conflict #8653

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

Jump to bottom
Merged
merged 1 commit into from
Feb 20, 2019
Merged

fix merge conflict #8653

merged 1 commit into from
Feb 20, 2019

Conversation

Danielhiversen
Copy link
Member

Description:

Pull request in home-assistant (if applicable): home-assistant/home-assistant#

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 assigned Danielhiversen Feb 20, 2019
@ghost ghost added the ready-for-review This PR needs to be reviewed label Feb 20, 2019
@fabaff fabaff merged commit 9cdfdc8 into current Feb 20, 2019
@delete-merged-branch delete-merged-branch bot deleted the Danielhiversen-patch-2 branch February 20, 2019 20:33
@ghost ghost removed the ready-for-review This PR needs to be reviewed label Feb 20, 2019
@klaasnicolaas klaasnicolaas added enhancement current This PR goes into the current branch labels Feb 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabaff fabaff fabaff approved these changes

Assignees

@Danielhiversen Danielhiversen

Labels
current This PR goes into the current branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Danielhiversen @fabaff @klaasnicolaas