Update package.json

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
 }
+