Fix bad merge lint

This commit is contained in:
Otto Winter 2020-07-26 22:59:46 +02:00
parent 9c0e463698
commit 4b8e910e3f
No known key found for this signature in database
GPG key ID: 48ED2DDB96D7682C
2 changed files with 0 additions and 1 deletions

View file

@ -12,7 +12,6 @@ from esphome.const import CONF_BROKER, CONF_DISCOVERY_PREFIX, CONF_ESPHOME, \
CONF_TOPIC, CONF_TOPIC_PREFIX, CONF_USERNAME CONF_TOPIC, CONF_TOPIC_PREFIX, CONF_USERNAME
from esphome.core import CORE, EsphomeError from esphome.core import CORE, EsphomeError
from esphome.helpers import color from esphome.helpers import color
from esphome.py_compat import decode_text
from esphome.util import safe_print from esphome.util import safe_print
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

View file