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

Merge pull request #1973 from kylehendricks/fix-unresolved-merge-conflict

Browse Source 
Fix an unresolved merge conflict
This commit is contained in:
Robbie Trencheny 2016-05-03 19:42:27 -07:00
commit 2874ad3445
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],
TYPE_WHATEVER,
GENRE_WHATEVER),
<<<<<<< HEAD
('hvac',
DISCOVER_HVAC,
[COMMAND_CLASS_THERMOSTAT_FAN_MODE],
TYPE_WHATEVER,
GENRE_WHATEVER),
=======
('lock',
DISCOVER_LOCKS,
[COMMAND_CLASS_DOOR_LOCK],
TYPE_BOOL,
GENRE_USER),
>>>>>>> pr/1969
]