Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.

conflic Resolution#587

Open
khzd wants to merge 82 commits intoesphome:devfrom
pi4homez:PPD42X
Open

conflic Resolution#587
khzd wants to merge 82 commits intoesphome:devfrom
pi4homez:PPD42X

Conversation

@khzd
Copy link
Copy Markdown

@khzd khzd commented Apr 14, 2019

Description:

have to rebase my initial request PPD42X

Related issue (if applicable): fixes

Pull request in esphome with python changes (if applicable): esphome/esphome#
Pull request in esphome-docs with documentation (if applicable): esphome/esphome-docs#

Checklist:

  • [ X] The code change is tested and works locally.
  • [ X] The code change follows the standards

If user exposed functionality or configuration variables are added/changed:

@khzd
Copy link
Copy Markdown
Author

khzd commented Apr 14, 2019

ok?

@pi4homez
Copy link
Copy Markdown

ok for merge?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants