优化

package.json

@@ -11,11 +11,8 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
-<<<<<<< HEAD
     "jquery": "^3.6.0",
-=======
     "global": "^4.4.0",
->>>>>>> e0b10598d66107bf1e5143918ed011a0be798972
     "js-cookie": "^2.2.1",
     "lib-flexible": "^0.3.2",
     "node-sass": "^5.0.0",
@@ -79,4 +76,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}