YIO-Remote / integration.home-assistant

🔌 Home Assistant Integration for YIO
GNU General Public License v3.0
4 stars 6 forks source link

Feature/interface update #10

Closed martonborzak closed 4 years ago

martonborzak commented 4 years ago

@ChristianRiedl could you look at the PR? There are many lines of conflicts.

martonborzak commented 4 years ago

From github webpage, because the feature branch was created after I finished my changes. I did not know that it makes a difference. But probably it is because of the line endings.

Usually I use QtCreators git integration.

Is it possible to remove this 2 commits. I switch to feature branch and push it again ?

I'll delete this branch and create it again so you can push it from your computer.