From d9dbc9b40f2c760c625247fdc7db54888c14c8fe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 26 Aug 2016 22:15:35 +0200
Subject: [PATCH] Fix blog post

---
 .../2016-07-16-sqlalchemy-knx-join-simplisafe.markdown     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/source/_posts/2016-07-16-sqlalchemy-knx-join-simplisafe.markdown b/source/_posts/2016-07-16-sqlalchemy-knx-join-simplisafe.markdown
index eb4e0aac409..5739266899d 100644
--- a/source/_posts/2016-07-16-sqlalchemy-knx-join-simplisafe.markdown
+++ b/source/_posts/2016-07-16-sqlalchemy-knx-join-simplisafe.markdown
@@ -70,15 +70,10 @@ Quick hot fix after we found a bug in the migrator where it wouldn't work with a
 [@turbokongen]: https://github.com/turbokongen/
 [@usul27]: https://github.com/usul27
 [@w1ll1am23]: https://github.com/w1ll1am23/
-<<<<<<< HEAD
-=======
 [@n8henrie]: https://github.com/n8henrie/
 [@AlucardZero]: https://github.com/AlucardZero/
-<<<<<<< HEAD
->>>>>>> master
-=======
 [@Danielhiversen]: https://github.com/danielhiversen
->>>>>>> origin/master
+
 
 [apcupsd-sensor]: /components/sensor.apcupsd/
 [Brightness]: /components/light/