From 5908b55bbabc5803833cc9ec88cbc17e8c2e48f1 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Thu, 29 Mar 2018 18:01:47 -0700
Subject: [PATCH] Fix merge conflict

---
 homeassistant/const.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 0ac3899cba6..d286aa85458 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -1,13 +1,8 @@
 # coding: utf-8
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
-<<<<<<< HEAD
 MINOR_VERSION = 67
 PATCH_VERSION = '0.dev0'
-=======
-MINOR_VERSION = 66
-PATCH_VERSION = '0b3'
->>>>>>> origin/rc
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)