admingitea/api-enhanced
1
0
Fork 0
mirror of https://github.com/NeteaseCloudMusicApiEnhanced/api-enhanced.git synced 2026-10-24 00:21:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
a632079
2020-09-05 01:21:12 +08:00
parent 2a04853948 5fc7b5999d
commit 40f8c7601c
3 changed files with 1377 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+997 -889
View File
File diff suppressed because it is too large Load Diff
package.json
+1 -1
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",
yarn.lock
+379 -368
View File
File diff suppressed because it is too large Load Diff