Merge pull request 'fix: remove stray v1.22.0 merge marker in ContextPanelRail.tsx' (#6) from fix/v1.22.0-marker into custom

2026-09-03 07:19:42 -04:00
parent 4042fc53a6 12e36f9f7f
commit 057e451068
1 changed files with 0 additions and 1 deletions
@@ -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);