From 134d05f5c596f440e59f37af5bf65dfcbf77a396 Mon Sep 17 00:00:00 2001 From: G Johansson Date: Mon, 6 Jul 2026 12:32:27 +0000 Subject: [PATCH] fix rebase --- homeassistant/helpers/entity_registry.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py index c202a3e7bec4..6872874483f6 100644 --- a/homeassistant/helpers/entity_registry.py +++ b/homeassistant/helpers/entity_registry.py @@ -16,11 +16,7 @@ from datetime import datetime, timedelta from enum import Enum, StrEnum import logging import time -<<<<<<< HEAD from typing import TYPE_CHECKING, Any, Literal, NotRequired, TypedDict, override -======= -from typing import TYPE_CHECKING, Any, Literal, NotRequired, TypedDict ->>>>>>> db2b796c904 (Fix) import attr import probatio @@ -2729,7 +2725,7 @@ def async_config_entry_disabled_by_changed( @callback def _async_setup_cleanup(hass: HomeAssistant, registry: EntityRegistry) -> None: """Clean up device registry when entities removed.""" - from . import category_registry as cr, event, label_registry as lr + from . import category_registry as cr, event, label_registry as lr # noqa: PLC0415 @callback def _removed_from_registry_filter(