fix: 修复 package.json 中的名称和版本冲突

ExamAware · Jan 16, 2025 · 774d8de · 774d8de
1 parent 20ef2f7
commit 774d8de
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,13 +1,7 @@
 {
-<<<<<<< HEAD
   "name": "dsz-examaware",
   "version": "1.0.0",
   "description": "智能考试看板",
-=======
-  "name": "examshowboard",
-  "version": "1.2.5",
-  "description": "电子考试展示板",
->>>>>>> 0595a1c7ce7837767c185ef0e876464907d746a9
   "main": "./out/main/index.js",
   "author": "Hello8693&MKStoler <[email protected]>",
   "homepage": "https://edicdn.eu.org/",