fix: resolve conflict
This commit is contained in:
parent
7fa65a26da
commit
6a85167ade
9 changed files with 36 additions and 47 deletions
3
.env
3
.env
|
@ -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=
|
Reference in a new issue