chore: resolve conflict
This commit is contained in:
parent
2f6c3d69df
commit
1927790d06
5 changed files with 72 additions and 21 deletions
1
.env
1
.env
|
@ -1,7 +1,6 @@
|
|||
API_KEY_TRAKT=
|
||||
API_KEY_MOVIEDB=
|
||||
API_KEY_WEBMENTIONS_CORYD_DEV=
|
||||
API_TOKEN_PINBOARD=
|
||||
API_APPLE_MUSIC_DEVELOPER_TOKEN=
|
||||
API_APPLE_MUSIC_USER_TOKEN=
|
||||
APPLE_RENEW_TOKEN_URL=
|
||||
|
|
Reference in a new issue