fix merge error

This commit is contained in:
Joseph Hughes 2016-01-14 11:01:53 -07:00
parent ac34db3c8a
commit 65a3bf2325

View File

@ -1,7 +1,7 @@
# coding: utf-8 # coding: utf-8
""" Constants used by Home Assistant components. """ """ 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. # Can be used to specify a catch all when registering state or event listeners.
MATCH_ALL = '*' MATCH_ALL = '*'