tryna fix merge conflicts the lazy way for PR #115

This commit is contained in:
Footsiefat 2021-10-25 17:20:08 +13:00 committed by GitHub
parent 55abce5421
commit 460ed67220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions

5
.gitignore vendored
View File

@ -150,4 +150,7 @@ ZSpotify\ Music/
ZSpotify\ Podcasts/
# Intellij
.idea
.idea
# Config file
zs_config.json