Fix brand images for Aurora ABB Powerone int.#1385
Closed
adrianmihalko wants to merge 8 commits intohome-assistant:masterfrom
Closed
Fix brand images for Aurora ABB Powerone int.#1385adrianmihalko wants to merge 8 commits intohome-assistant:masterfrom
adrianmihalko wants to merge 8 commits intohome-assistant:masterfrom
Conversation
cogneato
previously approved these changes
Apr 17, 2020
Contributor
cogneato
left a comment
There was a problem hiding this comment.
Thank you @adrianmihalko
frenck
previously approved these changes
Apr 17, 2020
Member
|
@adrianmihalko A wild merge conflict appeared... could you take a look? Thanks 👍 |
This reverts commit 525e832.
Contributor
Author
Yea, I removed symlinked directory, after merge I will post new images. |
Member
Contributor
Author
Hmm, let's try. As you can see in dcd8d33 I removed just symlink, otherwise if I remove and post new files it shows as conflict. |
Contributor
Author
|
Yeah, I have no ide why it shows up as conflicting file: |
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
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.

Proposed change
Fix Aurora ABB Solar PV brand images as requested by @davet2001 in #1354. Thanks!
Type of change
Additional information
Checklist
icon.png)icon@2x.png)logo.png)logo@2x.png)