fix: conflict
This commit is contained in:
commit
1c1a058675
4 changed files with 445 additions and 1271 deletions
2
cache/jsonfeed-to-mastodon-timestamp.json
vendored
2
cache/jsonfeed-to-mastodon-timestamp.json
vendored
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"timestamp": 1688414584776
|
||||
"timestamp": 1688500998610
|
||||
}
|
1706
cache/jsonfeed-to-mastodon.json
vendored
1706
cache/jsonfeed-to-mastodon.json
vendored
File diff suppressed because it is too large
Load diff
|
@ -18,7 +18,7 @@
|
|||
"@11ty/eleventy": "^2.0.1",
|
||||
"@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
|
||||
"@catppuccin/tailwindcss": "^0.1.6",
|
||||
"@fontsource/inter": "^5.0.3",
|
||||
"@fontsource/inter": "^5.0.4",
|
||||
"eslint": "^8.42.0",
|
||||
"eslint-config-prettier": "^8.8.0",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
|
|
|
@ -455,7 +455,7 @@
|
|||
fast-xml-parser "^4.2.4"
|
||||
html-entities "^2.3.6"
|
||||
|
||||
"@fontsource/inter@^5.0.3":
|
||||
"@fontsource/inter@^5.0.4":
|
||||
version "5.0.4"
|
||||
resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-5.0.4.tgz#95e5c9f082b285ed6375b1ea08af34489d52d236"
|
||||
integrity sha512-rUiTktdsh6B45XRZYTsZb2y4+TVkiVJhkqCSnSXfWxdUl0Rp6Cheu27IcurdjSfxJPUD+nl18wYp5RFf5P5zlA==
|
||||
|
|
Reference in a new issue