evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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],
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
]