jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 06:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Paulus Schoutsen 2018-03-29 18:01:47 -07:00
parent e5d76c53fb
commit 5908b55bba
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/const.py
View File

@ -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)