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

Fix an unresolved merge conflict

Browse Source
This commit is contained in:
Kyle Hendricks 2016-05-03 22:34:26 -04:00
parent 4850a65ed0
commit 8fc07ee6cd
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/components/zwave.py
View File

@ -94,19 +94,16 @@ DISCOVERY_COMPONENTS = [
[COMMAND_CLASS_THERMOSTAT_SETPOINT], [COMMAND_CLASS_THERMOSTAT_SETPOINT],
TYPE_WHATEVER, TYPE_WHATEVER,
GENRE_WHATEVER), GENRE_WHATEVER),
<<<<<<< HEAD
('hvac', ('hvac',
DISCOVER_HVAC, DISCOVER_HVAC,
[COMMAND_CLASS_THERMOSTAT_FAN_MODE], [COMMAND_CLASS_THERMOSTAT_FAN_MODE],
TYPE_WHATEVER, TYPE_WHATEVER,
GENRE_WHATEVER), GENRE_WHATEVER),
=======
('lock', ('lock',
DISCOVER_LOCKS, DISCOVER_LOCKS,
[COMMAND_CLASS_DOOR_LOCK], [COMMAND_CLASS_DOOR_LOCK],
TYPE_BOOL, TYPE_BOOL,
GENRE_USER), GENRE_USER),
>>>>>>> pr/1969
] ]