From 4b8e910e3f8a7bc3efc6a433ed6d8d5a8e0a9dad Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 22:59:46 +0200
Subject: [PATCH] Fix bad merge lint

---
 esphome/mqtt.py      | 1 -
 esphome/py_compat.py | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 esphome/py_compat.py

diff --git a/esphome/mqtt.py b/esphome/mqtt.py
index f46278018f..cbcf067c44 100644
--- a/esphome/mqtt.py
+++ b/esphome/mqtt.py
@@ -12,7 +12,6 @@ from esphome.const import CONF_BROKER, CONF_DISCOVERY_PREFIX, CONF_ESPHOME, \
     CONF_TOPIC, CONF_TOPIC_PREFIX, CONF_USERNAME
 from esphome.core import CORE, EsphomeError
 from esphome.helpers import color
-from esphome.py_compat import decode_text
 from esphome.util import safe_print
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/esphome/py_compat.py b/esphome/py_compat.py
deleted file mode 100644
index e69de29bb2..0000000000