chore: Conflict resolution

This commit is contained in:
Disy
2024-02-19 13:31:57 +08:00
parent d1eef6759c
commit 9b0f2d0983
51 changed files with 385 additions and 556 deletions

View File

@@ -1,11 +1,7 @@
// Electron 主进程 与 渲染进程 交互的桥梁
import {Config} from "./common/types";
import {
CHANNEL_GET_CONFIG,
CHANNEL_LOG,
CHANNEL_SET_CONFIG,
} from "./common/channels";
import {CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG,} from "./common/channels";
const {contextBridge} = require("electron");