Merge pull request 'fix: remove stray v1.22.0 merge marker in ContextPanelRail.tsx' (#6) from fix/v1.22.0-marker into custom
This commit is contained in:
@@ -295,7 +295,6 @@ export const ContextPanelRail: React.FC = () => {
|
|||||||
}
|
}
|
||||||
closeContextPanel(directoryKey);
|
closeContextPanel(directoryKey);
|
||||||
}, [activeMode, closeContextPanel, directoryKey, githubAuthChecked, githubConnected]);
|
}, [activeMode, closeContextPanel, directoryKey, githubAuthChecked, githubConnected]);
|
||||||
>>>>>>> origin/release/v1.22.0
|
|
||||||
|
|
||||||
const [isSurfacesDialogOpen, setIsSurfacesDialogOpen] = React.useState(false);
|
const [isSurfacesDialogOpen, setIsSurfacesDialogOpen] = React.useState(false);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user