From 7877a4f80c5cf0eb6cbbec155a00b1fce838923e Mon Sep 17 00:00:00 2001
From: CDL_LuFei <2249289718@qq.com>
Date: Sat, 5 Nov 2022 19:30:00 +0800
Subject: [PATCH] Update package.json

---
 package.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/package.json b/package.json
index a7839d9..34ffaec 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,6 @@
     "url": "git@gitcode.net:CDL_LuFei/1024opensource.git"
   },
   "author": "CDL_LuFei",
-<<<<<<< HEAD
   "license": "MIT"
-=======
-  "license": "MIT",
-  "dependencies": {
-    "live-server": "^1.2.2"
-  }
->>>>>>> 9e917bfa23863314b08dd03407e18a32f29896e5
 }
+
-- 
GitLab