merge冲突

fcfc8899 · 前端-许佳敏 · fc84dd54 · fcfc8899
Commit fcfc8899 authored Aug 26, 2020 by 前端-许佳敏
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

package.json package.json +0 -4

No files found.
--- a/package.json
+++ b/package.json
@@ -37,14 +37,10 @@
    "bizcharts": "^4.0.7",
    "copy-to-clipboard": "^3.3.1",
    "god": "0.1.24",
-<<<<<<< HEAD
-    "lingxi-design-ui": "^1.0.6",
-=======
    "lingxi-design": "^1.0.7",
    "lingxi-design-ui": "^1.0.8",
    "lingxi-editor-core": "^1.0.6",
    "lingxi-web": "^1.0.6",
->>>>>>> 9f7e1b348f491f1e89c0583cfd65a5497cd43a4e
    "lint-staged": "^10.0.7",
    "mobx": "^5.15.4",
    "mobx-react": "^6.2.2",