merge冲突
Showing
... | @@ -37,14 +37,10 @@ | ... | @@ -37,14 +37,10 @@ |
"bizcharts": "^4.0.7", | "bizcharts": "^4.0.7", | ||
"copy-to-clipboard": "^3.3.1", | "copy-to-clipboard": "^3.3.1", | ||
"god": "0.1.24", | "god": "0.1.24", | ||
<<<<<<< HEAD | |||
"lingxi-design-ui": "^1.0.6", | |||
======= | |||
"lingxi-design": "^1.0.7", | "lingxi-design": "^1.0.7", | ||
"lingxi-design-ui": "^1.0.8", | "lingxi-design-ui": "^1.0.8", | ||
"lingxi-editor-core": "^1.0.6", | "lingxi-editor-core": "^1.0.6", | ||
"lingxi-web": "^1.0.6", | "lingxi-web": "^1.0.6", | ||
>>>>>>> 9f7e1b348f491f1e89c0583cfd65a5497cd43a4e | |||
"lint-staged": "^10.0.7", | "lint-staged": "^10.0.7", | ||
"mobx": "^5.15.4", | "mobx": "^5.15.4", | ||
"mobx-react": "^6.2.2", | "mobx-react": "^6.2.2", | ||
... | ... |
Please
register
or
sign in
to comment