From 544149114ccf403eeab26c5b2af858365ff13dfd Mon Sep 17 00:00:00 2001
From: m <paragraphenreiter@gmail.com>
Date: Thu, 23 Apr 2026 00:24:13 +0200
Subject: [PATCH] fix: resolve leftover merge conflict markers in sidebar.ts

---
 frontend/src/client/sidebar.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/frontend/src/client/sidebar.ts b/frontend/src/client/sidebar.ts
index 1d36852..eb31734 100644
--- a/frontend/src/client/sidebar.ts
+++ b/frontend/src/client/sidebar.ts
@@ -1,14 +1,8 @@
 // Sidebar client-side behavior
 // Hover expand with delay, pin toggle, mobile hamburger
 
-<<<<<<< HEAD
 import { initGlobalSearch } from "./search";
-
-||||||| b06a040
-=======
 import { getChangelogSeen } from "./changelog-seen";
-
->>>>>>> mai/ritchie/what-s-new-changelog
 const PIN_KEY = "paliad-sidebar-pinned";
 const LEGACY_PIN_KEY = "patholo-sidebar-pinned";
 
@@ -27,12 +21,8 @@ function migrateLegacyPinKey(): void {
 export function initSidebar() {
   migrateLegacyPinKey();
   initInviteModal();
-<<<<<<< HEAD
   initGlobalSearch();
-||||||| b06a040
-=======
   initChangelogBadge();
->>>>>>> mai/ritchie/what-s-new-changelog
   const sidebar = document.querySelector<HTMLElement>(".sidebar");
   if (!sidebar) return;