From d387b19e0e7bedec75e001935463d5e47b4986de Mon Sep 17 00:00:00 2001 From: G Johansson Date: Thu, 4 Jun 2026 15:40:30 +0000 Subject: [PATCH] Fix --- homeassistant/helpers/entity_registry.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py index 281729f263d7..c202a3e7bec4 100644 --- a/homeassistant/helpers/entity_registry.py +++ b/homeassistant/helpers/entity_registry.py @@ -16,7 +16,11 @@ 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