Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
marshacb committed Dec 17, 2024
2 parents 8bbcaa2 + bf18c85 commit 3efe901
Show file tree
Hide file tree
Showing 2 changed files with 1,124 additions and 1,378 deletions.
21 changes: 14 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,31 @@
"ansi-colors": "^4.1.3",
"chalk": "5.3.0",
"cli-progress": "^3.12.0",
"typedoc": "^0.26.10",
"typedoc": "^0.27.5",
"typedoc-plugin-missing-exports": "^3.0.0",
"typedoc-theme-hierarchy": "^5.0.3",
"vitest": "^2.1.8"
},
"dependencies": {
"@acala-network/chopsticks-core": "^1.0.1",
"@acala-network/chopsticks-testing": "^1.0.1",
"@polkadot/api": "^14.2.3",
"@polkadot/api-augment": "^14.2.3",
"@polkadot/types": "^14.2.3",
"@polkadot/types-codec": "^14.2.3",
"@polkadot/api": "^15.0.2",
"@polkadot/api-augment": "^15.0.2",
"@polkadot/types": "^15.0.2",
"@polkadot/types-codec": "^15.0.2",
"@polkadot/util": "^13.2.3",
"@polkadot/util-crypto": "^13.2.3",
"@substrate/asset-transfer-api-registry": "^0.2.24"
},
"resolutions": {
"@polkadot/util-crypto": "13.2.2",
"@polkadot/util": "13.2.2"
"@polkadot/api": "^15.0.2",
"@polkadot/types-create": "15.0.2",
"@polkadot/rpc-provider": "15.0.2",
"@polkadot/api-augment": "^15.0.2",
"@polkadot/types": "^15.0.2",
"@polkadot/types-codec": "15.0.2",
"@polkadot/util-crypto": "13.2.3",
"@polkadot/util": "13.2.3",
"@polkadot/keyring": "13.2.3"
}
}
Loading

0 comments on commit 3efe901

Please sign in to comment.