fix: 解决冲突

AntmJS · Aug 16, 2021 · af128a1 · af128a1
1 parent 799d3b5
commit af128a1
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/packages/weui-demo/package.json b/packages/weui-demo/package.json
@@ -106,19  106,11 @@
     "build": "node ./updateVersion && cross-env BUILD_ENV=jenkins NODE_ENV=production npx taro build"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "@antmjs/cache": "^1.0.1",
-    "@antmjs/global-state": "^1.0.1",
-    "@antmjs/mini-fix": "^1.0.1",
-    "@antmjs/trace": "^1.0.1",
-    "@antmjs/weui": "^1.2.0",
-=======
     "@antmjs/cache": "1.3.0",
     "@antmjs/global-state": "1.3.0",
     "@antmjs/mini-fix": "1.3.0",
     "@antmjs/trace": "1.3.0",
     "@antmjs/weui": "1.3.0",
->>>>>>> 73888ad01d1dff42974d8c434a22dd69edfb4986
     "@babel/runtime-corejs3": "^7.14.7",
     "@tarojs/components": "3.3.2",
     "@tarojs/react": "3.3.2",
@@ -129,19  121,11 @@
     "react-dom": "^17.0.0"
   },
   "devDependencies": {
-<<<<<<< HEAD
-    "@antmjs/babel-preset": "^1.0.1",
-    "@antmjs/eslint": "^1.0.1",
-    "@antmjs/iconfont": "^1.0.1",
-    "@antmjs/plugin-mini-fix": "^1.0.1",
-    "@antmjs/stylelint": "^1.0.1",
-=======
     "@antmjs/babel-preset": "1.3.0",
     "@antmjs/eslint": "1.3.0",
     "@antmjs/iconfont": "1.3.0",
     "@antmjs/plugin-mini-fix": "1.3.0",
     "@antmjs/stylelint": "1.3.0",
->>>>>>> 73888ad01d1dff42974d8c434a22dd69edfb4986
     "@babel/core": "^7.8.0",
     "@commitlint/cli": "^12.1.4",
     "@commitlint/config-conventional": "^12.1.4",