Skip to content
This repository has been archived by the owner on Apr 25, 2024. It is now read-only.

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsy1218
jsy1218 committed Feb 23, 2024
1 parent 324ea40 commit 3ed4f79
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dependencies": {
"@ethersproject/address": "^5.0.0",
"@ethersproject/solidity": "^5.0.0",
"@uniswap/sdk-core": "^4.1.1",
"@uniswap/sdk-core": "^4.1.3",
"tiny-invariant": "^1.1.0",
"tiny-warning": "^1.0.3"
},
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1706,10 +1706,10 @@
semver "^7.3.2"
tsutils "^3.17.1"

"@uniswap/sdk-core@^4.1.1":
version "4.1.1"
resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.1.1.tgz#c7a8a89cd126f3537a3c406a72bb70eab598963f"
integrity sha512-f/FTqqDuxtN52QFXwABLE/fAu/tdpYyjucXdjWVCgfHB2DVn1H84KUHs0GGhAwDDFz6G59kMbsDbvgYW4yqvQQ==
"@uniswap/sdk-core@^4.1.3":
version "4.1.3"
resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.1.3.tgz#5db8c527eee89ac2467fa327bd42f0f17aee76ac"
integrity sha512-dbXX4Ivam5D90gwiT0MWgHSiKdl99rC0GiPcK8Pd+iFp2myypPX9ovTR3IncI3Y83mZrlBLX9XC1Q6kA/12hOg==
dependencies:
"@ethersproject/address" "^5.0.2"
big.js "^5.2.2"
Expand Down

0 comments on commit 3ed4f79

Please sign in to comment.