fix: merge conflict

This commit is contained in:
Cory Dransfeldt 2023-04-18 13:45:23 -07:00
parent 25987e430b
commit c95317a2df
No known key found for this signature in database
12 changed files with 94 additions and 8549 deletions

4
.env
View file

@ -1,5 +1,3 @@
API_KEY_LASTFM=
API_KEY_TRAKT=
API_KEY_WEBMENTIONS_CORYD_DEV=
TINA_CLIENT_ID=
TINA_TOKEN=
API_KEY_WEBMENTIONS_CORYD_DEV=