renil/neteasecloudmusicapi
1
0
Fork 0
mirror of https://gitlab.com/Binaryify/neteasecloudmusicapi.git synced 2025-05-23 22:37:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
a632079 2020-09-05 01:21:12 +08:00
commit 40f8c7601c
No known key found for this signature in database
GPG Key ID: 8A3F5C6934182137
3 changed files with 1377 additions and 1258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1882
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -51,7 +51,7 @@
"eslint-plugin-prettier": "^3.1.4", "eslint-plugin-prettier": "^3.1.4",
"husky": "4.2.5", "husky": "4.2.5",
"intelli-espower-loader": "1.0.1", "intelli-espower-loader": "1.0.1",
"lint-staged": "10.2.11", "lint-staged": "10.3.0",
"mocha": "8.1.3", "mocha": "8.1.3",
"power-assert": "1.6.1", "power-assert": "1.6.1",
"prettier": "^2.1.1", "prettier": "^2.1.1",

747
yarn.lock
View File

File diff suppressed because it is too large Load Diff