fix: conflict

This commit is contained in:
kunkka 2020-10-27 01:30:10 +08:00
commit 720d0b3116
29 changed files with 465 additions and 142 deletions

5
.gitignore vendored
View file

@ -26,4 +26,7 @@ pnpm-debug.log*
.vercel
#Electron-builder output
/dist_electron
/dist_electron
NeteaseCloudMusicApi-master
NeteaseCloudMusicApi-master.zip