From 12e36f9f7ffb56f0414afbb3d002308d8caa6b5f Mon Sep 17 00:00:00 2001
From: bot-hermes <bot-hermes@buzzbee.dev>
Date: Thu, 3 Sep 2026 11:17:49 +0000
Subject: [PATCH] fix(ui): remove stray v1.22.0 merge-conflict marker from
 ContextPanelRail.tsx

---
 packages/ui/src/components/layout/ContextPanelRail.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ui/src/components/layout/ContextPanelRail.tsx b/packages/ui/src/components/layout/ContextPanelRail.tsx
index 9aa81e8d..e4eb1381 100644
--- a/packages/ui/src/components/layout/ContextPanelRail.tsx
+++ b/packages/ui/src/components/layout/ContextPanelRail.tsx
@@ -295,7 +295,6 @@ export const ContextPanelRail: React.FC = () => {
     }
     closeContextPanel(directoryKey);
   }, [activeMode, closeContextPanel, directoryKey, githubAuthChecked, githubConnected]);
->>>>>>> origin/release/v1.22.0
 
   const [isSurfacesDialogOpen, setIsSurfacesDialogOpen] = React.useState(false);