Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b0c0659a

Commit b0c0659a authored 9 years ago by Paulus Schoutsen

Downloads
- Plain Diff

Merge branch 'clean-up-heat-control' into dev

Conflicts:
	homeassistant/components/thermostat/heat_control.py

parents 80a9422a c2d75efb

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

homeassistant/components/thermostat/__init__.py 3 additions, 2 deletions

homeassistant/components/thermostat/__init__.py
homeassistant/components/thermostat/heat_control.py 101 additions, 109 deletions

homeassistant/components/thermostat/heat_control.py
homeassistant/helpers/temperature.py 1 addition, 1 deletion

homeassistant/helpers/temperature.py
tests/components/thermostat/__init__.py 0 additions, 0 deletions

tests/components/thermostat/__init__.py
tests/components/thermostat/test_heat_control.py 115 additions, 0 deletions

tests/components/thermostat/test_heat_control.py

with 220 additions and 112 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Strive to be the person your dogs believe you are