From e7d8558af18250342f189e6b5a61e81ca3d9a068 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sat, 12 Mar 2016 10:54:42 -0800
Subject: [PATCH] Update date binary sensors markdown

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

diff --git a/source/_components/binary_sensor.mysensors.markdown b/source/_components/binary_sensor.mysensors.markdown
index ef7d2f5cfac..291392fe477 100644
--- a/source/_components/binary_sensor.mysensors.markdown
+++ b/source/_components/binary_sensor.mysensors.markdown
@@ -2,11 +2,7 @@
 layout: page
 title: "MySensors Binary Sensor"
 description: "Instructions how to integrate MySensors binary sensors into Home Assistant."
-<<<<<<< HEAD
-date: 2016-02-27 20:13 +0100
-=======
 date: 2016-02-28 01:20 +0100
->>>>>>> master
 sidebar: true
 comments: false
 sharing: true