fix: conflict

This commit is contained in:
kunkka 2020-10-31 14:06:28 +08:00
commit 309ca88c34
25 changed files with 630 additions and 75 deletions

View file

@ -41,6 +41,7 @@
"extract-zip": "^2.0.1",
"howler": "^2.2.0",
"js-cookie": "^2.2.1",
"localforage": "^1.9.0",
"nprogress": "^0.2.0",
"pac-proxy-agent": "^4.1.0",
"plyr": "^3.6.2",