Paulus Schoutsen 41b43199a3 Fix merge conflicts

2022-01-04 14:48:13 -08:00

..

auth

Add local only users (#57598)

2021-11-29 14:01:03 -08:00

backports

Move StrEnum to homeassistant.backports and move Platform to homeassistant.const (#60880)

2021-12-03 09:31:17 +01:00

components

Fix merge conflicts

2022-01-04 14:48:13 -08:00

fixtures

…

hassfest

…

helpers

Prevent log flooding in frame helper (#61085)

2021-12-06 15:53:54 -08:00

mock

…

resources

…

scripts

…

test_util

…

testing_config

Add native unit types for weather entities (#59533)

2021-11-29 14:44:44 +01:00

util

Fix exception in color_rgb_to_rgbww (#61466)

2021-12-11 13:36:20 +01:00

__init__.py

…

bandit.yaml

…

common.py

Allow to lock SQLite database during backup (#60874)

2021-12-09 12:07:41 +01:00

conftest.py

Introduce only_supervisor for @websocket_api.ws_require_user() (#61298)

2021-12-09 12:08:16 +01:00

ignore_uncaught_exceptions.py

…

test_bootstrap.py

…

test_config_entries.py

Use dataclass for HassioServiceInfo (#60824)

2021-12-03 14:05:56 +01:00

test_config.py

…

test_core.py

…

test_data_entry_flow.py

…

test_exceptions.py

…

test_loader.py

…

test_main.py

…

test_requirements.py

…

test_runner.py

…

test_setup.py

…

test_test_fixtures.py

…