1、项目整合

2025-12-05 13:55:38 +08:00
parent 0a20099289
commit 39733a0107
9 changed files with 91 additions and 177 deletions
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,6 @@
 {
  "compilerOptions": {
    "target": "esnext",
-<<<<<<< HEAD
    "module": "esnext",
    "moduleResolution": "bundler",
    "lib": ["esnext", "dom"],
@@ -38,18 +37,4 @@
    "uno.config.ts"
  ],
  "exclude": ["node_modules", "dist"]
-=======
-    "useDefineForClassFields": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "strict": true,
-    "jsx": "preserve",
-    "sourceMap": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "lib": ["esnext", "dom"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
-
->>>>>>> 232db255 ('首次提交')
 }