resolve conflict

This commit is contained in:
dakai
2023-04-03 03:07:16 +08:00
28 changed files with 1147 additions and 765 deletions

View File

@@ -14,6 +14,7 @@
"dependencies": {
"@svgr/webpack": "^6.5.1",
"@vercel/analytics": "^0.1.11",
"array.prototype.at": "^1.1.1",
"emoji-picker-react": "^4.4.7",
"eventsource-parser": "^0.1.0",
"fuse.js": "^6.6.2",
@@ -23,8 +24,8 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-markdown": "^8.0.5",
"rehype-highlight": "^6.0.0",
"rehype-katex": "^6.0.2",
"rehype-prism-plus": "^1.5.1",
"remark-breaks": "^3.0.2",
"remark-gfm": "^3.0.1",
"remark-math": "^5.1.1",