mirror of
https://github.com/cool-team-official/cool-admin-midway.git
synced 2024-11-01 14:10:29 +08:00
Merge branch '5.x' of https://e.coding.net/shancool/cool-admin/midway into 5.x
This commit is contained in:
commit
e8de10776b
@ -4,9 +4,13 @@
|
||||
"description": "",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
<<<<<<< HEAD
|
||||
"@cool-midway/core": "^5.1.7",
|
||||
=======
|
||||
"@cool-midway/core": "^5.1.5",
|
||||
>>>>>>> 317fc849c01cfaf6c0e1bc8b9362d0a542727fa8
|
||||
"@cool-midway/es": "^5.0.2",
|
||||
"@cool-midway/file": "^5.0.4",
|
||||
"@cool-midway/file": "^5.0.7",
|
||||
"@cool-midway/pay": "^5.0.0",
|
||||
"@cool-midway/rpc": "^5.0.1",
|
||||
"@cool-midway/task": "^5.0.1",
|
||||
|
Loading…
Reference in New Issue
Block a user