Skip to content

Commit c31cd59

Browse files
committed
Resolve merge conflicts in yarn.lock
Resolved merge conflicts and updated package versions in yarn.lock.
1 parent f3e6c97 commit c31cd59

2 files changed

Lines changed: 49 additions & 189 deletions

File tree

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"next": "15.4.9",
4141
"next-remote-watch": "^1.0.0",
4242
"parse-numeric-range": "^1.3.0",
43+
"raw-loader": "^4.0.2",
4344
"react": "^19.0.0",
4445
"react-collapsed": "4.2.0",
4546
"react-dom": "^19.0.0",
@@ -52,6 +53,7 @@
5253
"@babel/preset-react": "^7.26.3",
5354
"@mdx-js/mdx": "^2.1.3",
5455
"@resvg/resvg-js": "^2.6.2",
56+
"@shuding/opentype.js": "1.4.0-beta.0",
5557
"@types/body-scroll-lock": "^2.6.1",
5658
"@types/classnames": "^2.2.10",
5759
"@types/debounce": "^1.2.1",
@@ -92,6 +94,7 @@
9294
"postcss-flexbugs-fixes": "4.2.1",
9395
"postcss-preset-env": "^6.7.0",
9496
"prettier": "^2.5.1",
97+
"react-server-dom-webpack": "^19.2.4",
9598
"reading-time": "^1.5.0",
9699
"remark": "^12.0.1",
97100
"remark-external-links": "^7.0.0",

0 commit comments

Comments
 (0)