From 65a3bf232537f19f111533e6b9c5925050d9bbfc Mon Sep 17 00:00:00 2001
From: Joseph Hughes <jhughes@itriagehealth.com>
Date: Thu, 14 Jan 2016 11:01:53 -0700
Subject: [PATCH] fix merge error

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index e4d94039068..97e26f8d33a 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 """ Constants used by Home Assistant components. """
 
-__version__ = "0.10.1"
+__version__ = "0.11.0.dev0"
 
 # Can be used to specify a catch all when registering state or event listeners.
 MATCH_ALL = '*'