fix: resolve merge conflicts

This commit is contained in:
radishzzz 2025-05-28 20:56:38 +01:00
commit 0cbb8402b9
25 changed files with 311 additions and 242 deletions

View file

@ -47,7 +47,7 @@
"@astrojs/check": "^0.9.4",
"@types/hast": "^3.0.4",
"@types/markdown-it": "^14.1.2",
"@types/node": "^22.15.24",
"@types/node": "^22.15.23",
"@types/sanitize-html": "^2.16.0",
"@unocss/eslint-plugin": "66.1.2",
"@unocss/preset-attributify": "66.1.2",
@ -55,7 +55,6 @@
"astro-eslint-parser": "^1.2.2",
"eslint": "^9.27.0",
"eslint-plugin-astro": "^1.3.1",
"esno": "^4.8.0",
"lint-staged": "^16.1.0",
"typescript": "~5.8.3",
"unocss": "66.1.2",