MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-13 05:12:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Sehoon Shon
2026-02-03 17:19:31 -05:00
parent f24eaeffc6
commit 832c9cda6b
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/ui/AppContainer.tsx
-4
View File
@@ -189,10 +189,6 @@ export const AppContainer = (props: AppContainerProps) => {
const historyManager = useHistory({ const historyManager = useHistory({
chatRecordingService: config.getGeminiClient()?.getChatRecordingService(), chatRecordingService: config.getGeminiClient()?.getChatRecordingService(),
}); });
<<<<<<< HEAD
=======
>>>>>>> d63c34b6e (feat(ui): move user identity display to header (#18216))
useMemoryMonitor(historyManager); useMemoryMonitor(historyManager);
const settings = useSettings(); const settings = useSettings();
const isAlternateBuffer = useAlternateBuffer(); const isAlternateBuffer = useAlternateBuffer();