Skip to content

Commit

Permalink
actually resolve the git conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ElliotFriend committed Feb 18, 2025
1 parent aeb3b9e commit c4ebb7a
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"ap:versions:new": "docusaurus docs:version:ap $VERSION && node scripts/ap_new_version.mjs $VERSION"
},
"dependencies": {
<<<<<<< HEAD
"@crowdin/cli": "^4.6.0",
"@docusaurus/core": "3.7.0",
"@docusaurus/faster": "^3.7.0",
Expand All @@ -57,22 +56,6 @@
"clsx": "^2.1.1",
"docusaurus-plugin-openapi-docs": "4.3.4",
"docusaurus-plugin-sass": "^0.2.6",
=======
"@crowdin/cli": "^4.5.0",
"@docusaurus/core": "3.4.0",
"@docusaurus/preset-classic": "3.4.0",
"@docusaurus/remark-plugin-npm2yarn": "3.4.0",
"@docusaurus/theme-mermaid": "3.4.0",
"@mdx-js/react": "^3.0.0",
"@open-rpc/meta-schema": "^1.14.9",
"@open-rpc/schema-utils-js": "^1.16.2",
"@stellar/open-rpc-docs-react": "^0.2.1",
"ajv": "^8.16.0",
"axios": "^1.7.4",
"canvas-embed": "^1.0.80",
"clsx": "^2.0.0",
"docusaurus-plugin-openapi-docs": "^3.0.1",
>>>>>>> f9f98cc811708907e8c5162c908cfaf5209cd036
"docusaurus-plugin-sentry": "^2.0.0",
"docusaurus-theme-openapi-docs": "4.3.4",
"js-yaml": "^4.1.0",
Expand Down

0 comments on commit c4ebb7a

Please sign in to comment.