From f337ad3a4d337cf1718f285b95c8cb72d629463e Mon Sep 17 00:00:00 2001 From: suyao Date: Sun, 7 Dec 2025 21:11:19 +0800 Subject: [PATCH] fix: merge --- src/main/ipc.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/ipc.ts b/src/main/ipc.ts index f4f4f3d40a..3b7736a6d2 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -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_PauseWatcher, fileManager.pauseFileWatcher.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_UploadFolder, fileManager.uploadFolder.bind(fileManager)) ipcMain.handle(IpcChannel.File_UploadEntry, fileManager.uploadFileEntry.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)) // file service