fix: resolve conflict

This commit is contained in:
Cory Dransfeldt 2023-11-16 12:28:57 -08:00
parent 7fa65a26da
commit 6a85167ade
9 changed files with 36 additions and 47 deletions

3
.env
View file

@ -1,9 +1,8 @@
API_KEY_LASTFM=
API_KEY_PLAUSIBLE=
API_KEY_TRAKT=
API_KEY_MOVIEDB=
API_KEY_WEBMENTIONS_CORYD_DEV=
API_TOKEN_PINBOARD=
SITE_ID_CLICKY=
SITE_KEY_CLICKY=
SECRET_FEED_ALBUM_RELEASES=
COOKIE_STORYGRAPH=