Fix merge conflicts with main

This commit is contained in:
Luc Perkins 2024-06-03 13:44:53 -07:00
commit cbee267f6f
No known key found for this signature in database
GPG key ID: 16DB1108FB591835
4 changed files with 540 additions and 250 deletions

View file

@ -33,7 +33,7 @@
},
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/eslint-plugin": "^7.11.0",
"@vercel/ncc": "^0.38.1",
"eslint": "^8.57.0",
"eslint-import-resolver-typescript": "^3.6.1",