chore: Conflict resolution

2024-11-22 01:56:33 +00:00 · 2024-02-19 13:31:57 +08:00
parent d1eef6759c
commit 9b0f2d0983
51 changed files with 385 additions and 556 deletions
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -1,4 +1,4 @@
-import { Config } from "./common/types";
+import {Config} from "./common/types";


 declare var llonebot: {