fix: conflict

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

View file

@ -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",