merge: resolve conflicts from master

This commit is contained in:
github-actions[bot]
2026-01-22 18:11:44 +03:00
3 changed files with 119 additions and 194 deletions
+1 -1
View File
@@ -47,7 +47,7 @@ function createWebpack () {
],
resolve: {
alias: {
'@polkadot/hw-ledger-transports': require.resolve('@polkadot/hw-ledger-transports/node')
'@pezkuwi/hw-ledger-transports': require.resolve('@pezkuwi/hw-ledger-transports/node')
},
extensionAlias: {
'.js': ['.ts', '.tsx', '.js']
+2 -2
View File
@@ -17,8 +17,8 @@
"version": "1.0.2-1-x",
"dependencies": {
"@pezkuwi/hw-ledger": "^14.0.11",
"@pezkuwi/merkleize-metadata": "^1.0.0",
"@pezkuwi/react-components": "^1.0.2-1-x"
"@pezkuwi/react-components": "^1.0.2-1-x",
"@polkadot-api/merkleize-metadata": "^1.1.27"
},
"peerDependencies": {
"react": "*",