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

fix: merge conflict

Browse source
This commit is contained in:
Cory Dransfeldt 2023-08-04 11:48:41 -07:00
commit 3b743d60f7
No known key found for this signature in database
4 changed files with 524 additions and 1475 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": 1690927373606
}
"timestamp": 1691172189591
}

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

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -55,7 +55,7 @@
"marked": "^6.0.0",
"pagefind": "^0.12.0",
"postcss": "^8.4.27",
"prettier": "^3.0.0",
"prettier": "^3.0.1",
"prettier-plugin-tailwindcss": "^0.4.1",
"rss-parser": "^3.13.0",
"sanitize-html": "^2.11.0",

8
yarn.lock
View file

@ -5357,10 +5357,10 @@ prettier-plugin-tailwindcss@^0.4.1:
resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.1.tgz#f7ed664199540978b2cbd037bac3a337d6689e86"
integrity sha512-hwn2EiJmv8M+AW4YDkbjJ6HlZCTzLyz1QlySn9sMuKV/Px0fjwldlB7tol8GzdgqtkdPtzT3iJ4UzdnYXP25Ag==
prettier@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.0.tgz#e7b19f691245a21d618c68bc54dc06122f6105ae"
integrity sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==
prettier@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.1.tgz#65271fc9320ce4913c57747a70ce635b30beaa40"
integrity sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==
pretty-data@^0.40.0:
version "0.40.0"