Browse Source

解决packgage.json冲突问题

fujunwen 4 years ago
parent
commit
65a99312c1
1 changed files with 0 additions and 12 deletions
  1. 0 12
      package.json

+ 0 - 12
package.json

@@ -8,24 +8,12 @@
         "lint": "vue-cli-service lint"
         "lint": "vue-cli-service lint"
     },
     },
     "dependencies": {
     "dependencies": {
-<<<<<<< HEAD
-=======
-        "@saga-web/base": "2.1.22",
-        "@saga-web/big": "1.0.49",
-        "@saga-web/draw": "2.1.100",
-        "@saga-web/feng-map": "1.0.11",
-        "@saga-web/graph": "2.1.93",
->>>>>>> ba5c4eb9967ac6312b12415550c83bcd97127584
         "ant-design-vue": "^1.4.10",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",
         "core-js": "^3.4.4",
         "element-ui": "^2.13.2",
         "element-ui": "^2.13.2",
-<<<<<<< HEAD
         "lodash": "^4.17.15",
         "lodash": "^4.17.15",
-        "meri-design": "^1.2.8",
-=======
         "meri-design": "^1.3.2",
         "meri-design": "^1.3.2",
->>>>>>> ba5c4eb9967ac6312b12415550c83bcd97127584
         "moment": "^2.24.0",
         "moment": "^2.24.0",
         "quill": "^1.3.7",
         "quill": "^1.3.7",
         "vue": "^2.6.10",
         "vue": "^2.6.10",