From f90c991a899399c7bce7341aaca9b0d509fb8833 Mon Sep 17 00:00:00 2001
From: aapjeisbaas <github@steinvanbroekhoven.nl>
Date: Mon, 21 Jan 2019 20:38:27 +0100
Subject: [PATCH] Merge lines were not cleaned up after merge (#8227)

---
 source/_components/binary_sensor.mqtt.markdown | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source/_components/binary_sensor.mqtt.markdown b/source/_components/binary_sensor.mqtt.markdown
index 2961245dc45..d972e37862c 100644
--- a/source/_components/binary_sensor.mqtt.markdown
+++ b/source/_components/binary_sensor.mqtt.markdown
@@ -197,7 +197,3 @@ binary_sensor:
     payload_on: "1"
     payload_off: "0"
 ```
-<<<<<<< HEAD
-=======
-
->>>>>>> current