cdransf/coryd.dev-eleventy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: conflict

Browse source
This commit is contained in:
Cory Dransfeldt 2023-07-04 17:08:25 -07:00
commit 1c1a058675
No known key found for this signature in database
4 changed files with 445 additions and 1271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cache/jsonfeed-to-mastodon-timestamp.json vendored
View file

@ -1,3 +1,3 @@
{ {
"timestamp": 1688414584776 "timestamp": 1688500998610
} }

1708
cache/jsonfeed-to-mastodon.json vendored
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -18,7 +18,7 @@
"@11ty/eleventy": "^2.0.1", "@11ty/eleventy": "^2.0.1",
"@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
"@catppuccin/tailwindcss": "^0.1.6", "@catppuccin/tailwindcss": "^0.1.6",
"@fontsource/inter": "^5.0.3", "@fontsource/inter": "^5.0.4",
"eslint": "^8.42.0", "eslint": "^8.42.0",
"eslint-config-prettier": "^8.8.0", "eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",

2
yarn.lock
View file

@ -455,7 +455,7 @@
fast-xml-parser "^4.2.4" fast-xml-parser "^4.2.4"
html-entities "^2.3.6" html-entities "^2.3.6"
"@fontsource/inter@^5.0.3": "@fontsource/inter@^5.0.4":
version "5.0.4" version "5.0.4"
resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-5.0.4.tgz#95e5c9f082b285ed6375b1ea08af34489d52d236" resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-5.0.4.tgz#95e5c9f082b285ed6375b1ea08af34489d52d236"
integrity sha512-rUiTktdsh6B45XRZYTsZb2y4+TVkiVJhkqCSnSXfWxdUl0Rp6Cheu27IcurdjSfxJPUD+nl18wYp5RFf5P5zlA== integrity sha512-rUiTktdsh6B45XRZYTsZb2y4+TVkiVJhkqCSnSXfWxdUl0Rp6Cheu27IcurdjSfxJPUD+nl18wYp5RFf5P5zlA==