Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fix an unresolved merge conflict
pull/1976/head
Robbie Trencheny 2016-05-03 19:42:27 -07:00
parent 4850a65ed0 8fc07ee6cd
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], [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
] ]