From 60c5d45f846674cd62b4461d1d10246aa25b8bd7 Mon Sep 17 00:00:00 2001
From: Till <till.fleisch@t-online.de>
Date: Sun, 9 Apr 2023 19:36:51 +0200
Subject: [PATCH] Fix merge conflict

---
 src/panels/lovelace/components/hui-energy-period-selector.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panels/lovelace/components/hui-energy-period-selector.ts b/src/panels/lovelace/components/hui-energy-period-selector.ts
index 18fb67c7cd91..f0d8a8e508f7 100644
--- a/src/panels/lovelace/components/hui-energy-period-selector.ts
+++ b/src/panels/lovelace/components/hui-energy-period-selector.ts
@@ -65,7 +65,7 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
   public connectedCallback() {
     super.connectedCallback();
     if (this.narrow !== false) {
-      toggleAttribute(this, "narrow", this.offsetWidth < 500);
+      toggleAttribute(this, "narrow", this.offsetWidth < 600);
     }
   }