feat: 解决冲突

package.json

@@ -4,17 +4,12 @@
   "private": true,
   "private": true,
   "license": "UNLICENSED",
   "license": "UNLICENSED",
   "scripts": {
   "scripts": {
-<<<<<<< HEAD
-    "serve:dev": "cross-env mode=test nuxt",
-    "serve:pre": "cross-env mode=preview nuxt",
-=======
     "release": "standard-version",
     "release": "standard-version",
     "release:minor": "standard-version -r minor",
     "release:minor": "standard-version -r minor",
     "release:patch": "standard-version -r patch",
     "release:patch": "standard-version -r patch",
     "serve": "cross-env mode=dev nuxt",
     "serve": "cross-env mode=dev nuxt",
     "serve:dev": "cross-env mode=dev nuxt",
     "serve:dev": "cross-env mode=dev nuxt",
     "serve:pre": "cross-env mode=pre nuxt",
     "serve:pre": "cross-env mode=pre nuxt",
->>>>>>> feature/newDraw
     "serve:prod": "cross-env mode=production nuxt",
     "serve:prod": "cross-env mode=production nuxt",
     "serve:cm": "cross-env mode=cm nuxt",
     "serve:cm": "cross-env mode=cm nuxt",
     "serve:vvku": "cross-env mode=vvku nuxt",
     "serve:vvku": "cross-env mode=vvku nuxt",
@@ -95,4 +90,4 @@
     "postcss-pxtorem": "^5.1.1",
     "postcss-pxtorem": "^5.1.1",
     "prettier": "^2.3.2"
     "prettier": "^2.3.2"
   }
   }
-}
+}
\ No newline at end of file