fix: merge conflict
This commit is contained in:
commit
123a08df8b
4 changed files with 418 additions and 899 deletions
|
@ -23,7 +23,7 @@
|
|||
"eslint": "^8.38.0",
|
||||
"eslint-config-prettier": "^8.8.0",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
"postcss": "^8.4.5",
|
||||
"postcss": "^8.4.22",
|
||||
"prettier": "^2.8.7",
|
||||
"prettier-plugin-tailwindcss": "^0.2.7",
|
||||
"sanitize-html": "^2.10.0"
|
||||
|
@ -39,8 +39,8 @@
|
|||
"@tailwindcss/aspect-ratio": "^0.4.2",
|
||||
"@tailwindcss/typography": "^0.5.1",
|
||||
"@tinacms/cli": "^1.5.6",
|
||||
"@typescript-eslint/eslint-plugin": "^5.58.0",
|
||||
"@typescript-eslint/parser": "^5.58.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.59.0",
|
||||
"@typescript-eslint/parser": "^5.59.0",
|
||||
"autoprefixer": "^10.4.2",
|
||||
"dotenv-flow": "^3.2.0",
|
||||
"eleventy-plugin-unfurl": "^1.0.0",
|
||||
|
|
Reference in a new issue