Update notify.lametric.markdown #4010
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Rename configuration_yaml_by_aneisch to configuration_yaml_by_aneisch.markdown * Rename configuration_yaml_by_cy1701 to configuration_yaml_by_cy1701.markdown * Rename configuration_yaml_by_mf_social to configuration_yaml_by_mf_social.markdown * Update configuration_yaml_by_mf_social.markdown * Rename configuration_yaml_by_stanvx to configuration_yaml_by_stanvx.markdown
Tested and working with LC-60EQ10U
MartinHjelmare
approved these changes
Nov 18, 2017
MartinHjelmare
requested changes
Nov 18, 2017
|
Changed. |
|
You need to rebase since your changes now contain other files that shouldn't be part of this PR. See https://home-assistant.io/developers/development_catching_up/ for general instructions. Replace branch names with corresponding branch names for this repo. |
|
@MartinHjelmare Need your further assistance. Created the PR here in git, not with a local repo. What can I do to resolve the conflicts? |
|
If you want to do this all online on github then I think you need to create a new PR, starting from the next branch. |
|
@MartinHjelmare Created a new one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Updated documentation for cycles config option and additional service data example.
Pull request in home-assistant (if applicable): home-assistant/core#10656