Skip to content

Commit dd267cb

Browse files
Adamj1232Adamj1232
committed
Handle merge conflicts
1 parent 7cd83b6 commit dd267cb

File tree

18 files changed

+0
-143
lines changed

18 files changed

+0
-143
lines changed

‎packages/dcent/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/dcent",
3-
<<<<<<< HEAD
43
"version": "2.0.6",
5-
=======
6-
"version": "2.0.5",
7-
>>>>>>> v2-web3-onboard
84
"description": "D'CENT wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -58,11 +54,7 @@
5854
"typescript": "^4.5.5"
5955
},
6056
"dependencies": {
61-
<<<<<<< HEAD
6257
"@web3-onboard/common": "^2.1.6",
63-
=======
64-
"@web3-onboard/common": "^2.1.5",
65-
>>>>>>> v2-web3-onboard
6658
"@ethereumjs/common": "^2.6.1",
6759
"@ethereumjs/tx": "^3.4.0",
6860
"@ethersproject/providers": "^5.5.0",

‎packages/demo/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,8 @@
2323
},
2424
"dependencies": {
2525
"@web3-onboard/coinbase": "^2.0.8",
26-
<<<<<<< HEAD
2726
"@web3-onboard/core": "^2.4.1-alpha.1",
2827
"@web3-onboard/dcent": "^2.0.5",
29-
=======
30-
"@web3-onboard/core": "^2.4.0",
31-
"@web3-onboard/dcent": "^2.0.6",
32-
>>>>>>> v2-web3-onboard
3328
"@web3-onboard/fortmatic": "^2.0.6",
3429
"@web3-onboard/gnosis": "^2.0.5",
3530
"@web3-onboard/injected-wallets": "^2.0.12",

‎packages/fortmatic/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/fortmatic",
3-
<<<<<<< HEAD
43
"version": "2.0.8",
5-
=======
6-
"version": "2.0.7",
7-
>>>>>>> v2-web3-onboard
84
"description": "Fortmatic wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -61,11 +57,7 @@
6157
"typescript": "^4.5.5"
6258
},
6359
"dependencies": {
64-
<<<<<<< HEAD
6560
"@web3-onboard/common": "^2.1.6",
66-
=======
67-
"@web3-onboard/common": "^2.1.5",
68-
>>>>>>> v2-web3-onboard
6961
"fortmatic": "^2.2.1"
7062
}
7163
}

‎packages/gnosis/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/gnosis",
3-
<<<<<<< HEAD
43
"version": "2.0.7",
5-
=======
6-
"version": "2.0.6",
7-
>>>>>>> v2-web3-onboard
84
"description": "Gnosis Safe module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -63,10 +59,6 @@
6359
"dependencies": {
6460
"@gnosis.pm/safe-apps-provider": "^0.9.2",
6561
"@gnosis.pm/safe-apps-sdk": "^6.1.1",
66-
<<<<<<< HEAD
6762
"@web3-onboard/common": "^2.1.6"
68-
=======
69-
"@web3-onboard/common": "^2.1.5"
70-
>>>>>>> v2-web3-onboard
7163
}
7264
}

‎packages/injected/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/injected-wallets",
3-
<<<<<<< HEAD
43
"version": "2.0.14",
5-
=======
6-
"version": "2.0.13",
7-
>>>>>>> v2-web3-onboard
84
"description": "Injected wallet module for connecting browser extension and mobile wallets to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -66,11 +62,7 @@
6662
"window": "^4.2.7"
6763
},
6864
"dependencies": {
69-
<<<<<<< HEAD
7065
"@web3-onboard/common": "^2.1.6",
71-
=======
72-
"@web3-onboard/common": "^2.1.5",
73-
>>>>>>> v2-web3-onboard
7466
"joi": "^17.4.2",
7567
"lodash.uniqby": "^4.7.0"
7668
}

‎packages/keepkey/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/keepkey",
3-
<<<<<<< HEAD
43
"version": "2.1.6",
5-
=======
6-
"version": "2.1.5",
7-
>>>>>>> v2-web3-onboard
84
"description": "KeepKey hardware wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -67,11 +63,7 @@
6763
"@ethersproject/providers": "^5.5.0",
6864
"@shapeshiftoss/hdwallet-core": "^1.15.2",
6965
"@shapeshiftoss/hdwallet-keepkey-webusb": "^1.15.2",
70-
<<<<<<< HEAD
7166
"@web3-onboard/common": "^2.1.6",
72-
=======
73-
"@web3-onboard/common": "^2.1.5",
74-
>>>>>>> v2-web3-onboard
7567
"ethereumjs-util": "^7.1.3"
7668
}
7769
}

‎packages/keystone/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/keystone",
3-
<<<<<<< HEAD
43
"version": "2.1.7",
5-
=======
6-
"version": "2.1.6",
7-
>>>>>>> v2-web3-onboard
84
"description": "Keystone hardware wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -61,10 +57,6 @@
6157
"@ethereumjs/tx": "^3.4.0",
6258
"@ethersproject/providers": "^5.5.0",
6359
"@keystonehq/eth-keyring": "^0.14.0-alpha.10.3",
64-
<<<<<<< HEAD
6560
"@web3-onboard/common": "^2.1.6"
66-
=======
67-
"@web3-onboard/common": "^2.1.5"
68-
>>>>>>> v2-web3-onboard
6961
}
7062
}

‎packages/ledger/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/ledger",
3-
<<<<<<< HEAD
43
"version": "2.1.6",
5-
=======
6-
"version": "2.1.5",
7-
>>>>>>> v2-web3-onboard
84
"description": "Ledger hardare wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -67,11 +63,7 @@
6763
"@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
6864
"@ledgerhq/hw-transport-webusb": "^6.19.0",
6965
"@metamask/eth-sig-util": "^4.0.0",
70-
<<<<<<< HEAD
7166
"@web3-onboard/common": "^2.1.6",
72-
=======
73-
"@web3-onboard/common": "^2.1.5",
74-
>>>>>>> v2-web3-onboard
7567
"buffer": "^6.0.3",
7668
"ethereumjs-util": "^7.1.3"
7769
}

‎packages/magic/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/magic",
3-
<<<<<<< HEAD
43
"version": "2.0.9",
5-
=======
6-
"version": "2.0.8",
7-
>>>>>>> v2-web3-onboard
84
"description": "Magic SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -82,11 +78,7 @@
8278
"typescript": "^4.5.5"
8379
},
8480
"dependencies": {
85-
<<<<<<< HEAD
8681
"@web3-onboard/common": "^2.1.6",
87-
=======
88-
"@web3-onboard/common": "^2.1.5",
89-
>>>>>>> v2-web3-onboard
9082
"joi": "^17.4.2",
9183
"magic-sdk": "^8.1.0",
9284
"rxjs": "^7.5.2"

‎packages/mew/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/mew",
3-
<<<<<<< HEAD
43
"version": "2.0.6",
5-
=======
6-
"version": "2.0.5",
7-
>>>>>>> v2-web3-onboard
84
"description": "MEW (My Ether Wallet) SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -63,11 +59,7 @@
6359
"@myetherwallet/mewconnect-web-client": "^2.2.0-beta.14"
6460
},
6561
"dependencies": {
66-
<<<<<<< HEAD
6762
"@web3-onboard/common": "^2.1.6",
68-
=======
69-
"@web3-onboard/common": "^2.1.5",
70-
>>>>>>> v2-web3-onboard
7163
"rxjs": "^7.5.2"
7264
}
7365
}

‎packages/portis/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/portis",
3-
<<<<<<< HEAD
43
"version": "2.0.6",
5-
=======
6-
"version": "2.0.5",
7-
>>>>>>> v2-web3-onboard
84
"description": "Portis SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -61,10 +57,6 @@
6157
},
6258
"dependencies": {
6359
"@portis/web3": "^4.0.6",
64-
<<<<<<< HEAD
6560
"@web3-onboard/common": "^2.1.6"
66-
=======
67-
"@web3-onboard/common": "^2.1.5"
68-
>>>>>>> v2-web3-onboard
6961
}
7062
}

‎packages/react/package.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/react",
3-
<<<<<<< HEAD
43
"version": "2.2.4",
5-
=======
6-
"version": "2.2.3",
7-
>>>>>>> v2-web3-onboard
84
"description": "A collection of React hooks for integrating Web3-Onboard in to React and Next.js projects. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -63,13 +59,8 @@
6359
"typescript": "^4.5.5"
6460
},
6561
"dependencies": {
66-
<<<<<<< HEAD
6762
"@web3-onboard/core": "^2.4.1",
6863
"@web3-onboard/common": "^2.1.6",
69-
=======
70-
"@web3-onboard/core": "^2.4.0",
71-
"@web3-onboard/common": "^2.1.5",
72-
>>>>>>> v2-web3-onboard
7364
"use-sync-external-store": "1.0.0"
7465
},
7566
"peerDependencies": {

‎packages/torus/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/torus",
3-
<<<<<<< HEAD
43
"version": "2.0.7",
5-
=======
6-
"version": "2.0.6",
7-
>>>>>>> v2-web3-onboard
84
"description": "Torus SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -61,10 +57,6 @@
6157
},
6258
"dependencies": {
6359
"@toruslabs/torus-embed": "^1.18.3",
64-
<<<<<<< HEAD
6560
"@web3-onboard/common": "^2.1.6"
66-
=======
67-
"@web3-onboard/common": "^2.1.5"
68-
>>>>>>> v2-web3-onboard
6961
}
7062
}

‎packages/trezor/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/trezor",
3-
<<<<<<< HEAD
43
"version": "2.1.6",
5-
=======
6-
"version": "2.1.5",
7-
>>>>>>> v2-web3-onboard
84
"description": "Trezor hardware wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -62,11 +58,7 @@
6258
"dependencies": {
6359
"@ethereumjs/tx": "^3.4.0",
6460
"@ethersproject/providers": "^5.5.0",
65-
<<<<<<< HEAD
6661
"@web3-onboard/common": "^2.1.6",
67-
=======
68-
"@web3-onboard/common": "^2.1.5",
69-
>>>>>>> v2-web3-onboard
7062
"buffer": "^6.0.3",
7163
"eth-crypto": "^2.1.0",
7264
"ethereumjs-util": "^7.1.3",

‎packages/vue/package.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/vue",
3-
<<<<<<< HEAD
43
"version": "2.1.4",
5-
=======
6-
"version": "2.1.3",
7-
>>>>>>> v2-web3-onboard
84
"description": "A collection of Vue Composables for integrating Web3-Onboard in to a Vue or Nuxt project. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -63,13 +59,8 @@
6359
"dependencies": {
6460
"@vueuse/core": "^8.4.2",
6561
"@vueuse/rxjs": "^8.2.0",
66-
<<<<<<< HEAD
6762
"@web3-onboard/common": "^2.1.6",
6863
"@web3-onboard/core": "^2.4.1",
69-
=======
70-
"@web3-onboard/common": "^2.1.5",
71-
"@web3-onboard/core": "^2.4.0",
72-
>>>>>>> v2-web3-onboard
7364
"vue-demi": "^0.12.4"
7465
},
7566
"peerDependencies": {

‎packages/walletconnect/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/walletconnect",
3-
<<<<<<< HEAD
43
"version": "2.0.7",
5-
=======
6-
"version": "2.0.6",
7-
>>>>>>> v2-web3-onboard
84
"description": "WalletConnect SDK module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -63,11 +59,7 @@
6359
"@ethersproject/providers": "^5.5.0",
6460
"@walletconnect/client": "^1.7.1",
6561
"@walletconnect/qrcode-modal": "^1.7.1",
66-
<<<<<<< HEAD
6762
"@web3-onboard/common": "^2.1.6",
68-
=======
69-
"@web3-onboard/common": "^2.1.5",
70-
>>>>>>> v2-web3-onboard
7163
"rxjs": "^7.5.2"
7264
}
7365
}

‎packages/walletlink/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@web3-onboard/walletlink",
3-
<<<<<<< HEAD
43
"version": "2.0.6",
5-
=======
6-
"version": "2.0.5",
7-
>>>>>>> v2-web3-onboard
84
"description": "(DEPRECATED. Use @web3-onboard/coinbase instead) WalletLink SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
95
"keywords": [
106
"Ethereum",
@@ -60,11 +56,7 @@
6056
"typescript": "^4.5.5"
6157
},
6258
"dependencies": {
63-
<<<<<<< HEAD
6459
"@web3-onboard/common": "^2.1.6",
65-
=======
66-
"@web3-onboard/common": "^2.1.5",
67-
>>>>>>> v2-web3-onboard
6860
"walletlink": "^2.5.0"
6961
}
7062
}

0 commit comments

Comments
 (0)