Skip to content
Prev Previous commit
Next Next commit
Merge branch 'main' into bump-to-yarn-v4
  • Loading branch information
mcmire committed Jun 26, 2024
commit aa08a3c1bd010200310d3f4bfd97b7f845edfefc
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2195,7 +2195,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/accounts-controller@npm:^17.0.0, @metamask/accounts-controller@workspace:packages/accounts-controller":
"@metamask/accounts-controller@npm:^17.1.0, @metamask/accounts-controller@workspace:packages/accounts-controller":
version: 0.0.0-use.local
resolution: "@metamask/accounts-controller@workspace:packages/accounts-controller"
dependencies:
Expand Down Expand Up @@ -2313,7 +2313,7 @@ __metadata:
"@ethersproject/contracts": "npm:^5.7.0"
"@ethersproject/providers": "npm:^5.7.0"
"@metamask/abi-utils": "npm:^2.0.2"
"@metamask/accounts-controller": "npm:^17.0.0"
"@metamask/accounts-controller": "npm:^17.1.0"
"@metamask/approval-controller": "npm:^7.0.0"
"@metamask/auto-changelog": "npm:^3.4.4"
"@metamask/base-controller": "npm:^6.0.0"
Expand Down Expand Up @@ -3770,7 +3770,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/transaction-controller@npm:^33.0.0, @metamask/transaction-controller@workspace:packages/transaction-controller":
"@metamask/transaction-controller@npm:^33.0.1, @metamask/transaction-controller@workspace:packages/transaction-controller":
version: 0.0.0-use.local
resolution: "@metamask/transaction-controller@workspace:packages/transaction-controller"
dependencies:
Expand All @@ -3781,7 +3781,7 @@ __metadata:
"@ethersproject/abi": "npm:^5.7.0"
"@ethersproject/contracts": "npm:^5.7.0"
"@ethersproject/providers": "npm:^5.7.0"
"@metamask/accounts-controller": "npm:^17.0.0"
"@metamask/accounts-controller": "npm:^17.1.0"
"@metamask/approval-controller": "npm:^7.0.0"
"@metamask/auto-changelog": "npm:^3.4.4"
"@metamask/base-controller": "npm:^6.0.0"
Expand Down Expand Up @@ -3837,7 +3837,7 @@ __metadata:
"@metamask/network-controller": "npm:^19.0.0"
"@metamask/polling-controller": "npm:^8.0.0"
"@metamask/rpc-errors": "npm:^6.2.1"
"@metamask/transaction-controller": "npm:^33.0.0"
"@metamask/transaction-controller": "npm:^33.0.1"
"@metamask/utils": "npm:^8.3.0"
"@types/jest": "npm:^27.4.1"
bn.js: "npm:^5.2.1"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.