From c03f729fafa7e527e541602e9cee5d45bc37fff3 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 3 Feb 2025 19:54:08 +0100
Subject: [PATCH] Conflict fixes

---
 src/lib/layout/shell.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 4576c5a49..3e2456d91 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -74,8 +74,8 @@
     let showAccountMenu = false;
     let subNavigation: undefined | ComponentType = $page.data.subNavigation;
     let state: undefined | 'open' | 'closed' | 'icons' = 'closed';
-    $: state = $sideBarIsOpen ? 'open' : 'closed';
-    $: state = !$isTabletViewport ? 'icons' : $sideBarIsOpen ? 'open' : 'closed';
+    $: state = $isSidebarOpen ? 'open' : 'closed';
+    $: state = !$isTabletViewport ? 'icons' : $isSidebarOpen ? 'open' : 'closed';
 
     function handleResize() {
         $isSidebarOpen = false;