Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-04 11:49:02 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: merge

Browse Source
This commit is contained in:
suyao 2025-12-07 21:11:19 +08:00
parent d25a6c4e0f
commit f337ad3a4d
No known key found for this signature in database
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/ipc.ts
View File

@ -579,14 +579,10 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
ipcMain.handle(IpcChannel.File_StopWatcher, fileManager.stopFileWatcher.bind(fileManager)) ipcMain.handle(IpcChannel.File_StopWatcher, fileManager.stopFileWatcher.bind(fileManager))
ipcMain.handle(IpcChannel.File_PauseWatcher, fileManager.pauseFileWatcher.bind(fileManager)) ipcMain.handle(IpcChannel.File_PauseWatcher, fileManager.pauseFileWatcher.bind(fileManager))
ipcMain.handle(IpcChannel.File_ResumeWatcher, fileManager.resumeFileWatcher.bind(fileManager)) ipcMain.handle(IpcChannel.File_ResumeWatcher, fileManager.resumeFileWatcher.bind(fileManager))
<<<<<<< HEAD
ipcMain.handle(IpcChannel.File_BatchUpload, fileManager.batchUpload.bind(fileManager)) ipcMain.handle(IpcChannel.File_BatchUpload, fileManager.batchUpload.bind(fileManager))
ipcMain.handle(IpcChannel.File_UploadFolder, fileManager.uploadFolder.bind(fileManager)) ipcMain.handle(IpcChannel.File_UploadFolder, fileManager.uploadFolder.bind(fileManager))
ipcMain.handle(IpcChannel.File_UploadEntry, fileManager.uploadFileEntry.bind(fileManager)) ipcMain.handle(IpcChannel.File_UploadEntry, fileManager.uploadFileEntry.bind(fileManager))
ipcMain.handle(IpcChannel.File_BatchUploadEntries, fileManager.batchUploadEntries.bind(fileManager)) ipcMain.handle(IpcChannel.File_BatchUploadEntries, fileManager.batchUploadEntries.bind(fileManager))
=======
ipcMain.handle(IpcChannel.File_BatchUploadMarkdown, fileManager.batchUploadMarkdownFiles.bind(fileManager))
>>>>>>> origin/main
ipcMain.handle(IpcChannel.File_ShowInFolder, fileManager.showInFolder.bind(fileManager)) ipcMain.handle(IpcChannel.File_ShowInFolder, fileManager.showInFolder.bind(fileManager))
// file service // file service