From 0aa29418686faa4bc5b3dc50fba3c99ec7b77c79 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Sat, 11 Oct 2025 14:41:42 +0200
Subject: [PATCH 1/2] Fix unresolved merge conflict in core style

---
 src/resources/theme/core.globals.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/resources/theme/core.globals.ts b/src/resources/theme/core.globals.ts
index 91e0fa3731..9bcfdd6603 100644
--- a/src/resources/theme/core.globals.ts
+++ b/src/resources/theme/core.globals.ts
@@ -19,8 +19,6 @@ export const coreStyles = css`
     --ha-border-radius-pill: 9999px;
     --ha-border-radius-circle: 50%;
     --ha-border-radius-square: 0;
-<<<<<<< HEAD
-=======
 
     /* Spacing */
     --ha-space-0: 0px;
@@ -44,7 +42,6 @@ export const coreStyles = css`
     --ha-space-18: 72px;
     --ha-space-19: 76px;
     --ha-space-20: 80px;
->>>>>>> 994c1b575 (Fix intl polyfill loading (#27261))
   }
 `;
 

From ee2ec00069c1ccb6b37279f46ecf62f403fb2bf2 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Sat, 11 Oct 2025 14:41:59 +0200
Subject: [PATCH 2/2] Bumped version to 20251001.4

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index a45f0eee97..be6ef65d51 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20251001.3"
+version      = "20251001.4"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"