Theo/proposal-25-restore-rewards
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Theo 2023-06-13 11:37:43 -07:00
parent e049d9b107
commit f2a0e18cc0
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -23,18 +23,15 @@
"web3-utils": "^1.10.0" "web3-utils": "^1.10.0"
}, },
"devDependencies": { "devDependencies": {
<<<<<<< HEAD
"@nomiclabs/hardhat-ethers": "^2.2.3", "@nomiclabs/hardhat-ethers": "^2.2.3",
"@nomiclabs/hardhat-waffle": "^2.0.6", "@nomiclabs/hardhat-waffle": "^2.0.6",
"chai": "^4.3.7", "chai": "^4.3.7",
"ethereum-waffle": "^4.0.10", "ethereum-waffle": "^4.0.10",
"ethers": "^6.5.1", "ethers": "^6.5.1",
=======
"@nomicfoundation/hardhat-foundry": "^1.0.1", "@nomicfoundation/hardhat-foundry": "^1.0.1",
"@nomicfoundation/hardhat-verify": "^1.0.1", "@nomicfoundation/hardhat-verify": "^1.0.1",
"@nomiclabs/hardhat-ethers": "^2.2.3", "@nomiclabs/hardhat-ethers": "^2.2.3",
"ethers": "^5", "ethers": "^5",
>>>>>>> 80078475d5d09a2b730f8334120a524d069ec5b1
"hardhat": "^2.15.0", "hardhat": "^2.15.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "^5.1.3" "typescript": "^5.1.3"