Fix merge conflicts

2023-06-13 11:37:43 -07:00 · 2023-06-13 11:37:43 -07:00 · f2a0e18cc0
commit f2a0e18cc0
parent e049d9b107
1 changed files with 0 additions and 3 deletions
--- a/package.json
+++ b/package.json
@ -23,18 +23,15 @@
    "web3-utils": "^1.10.0"
  },
  "devDependencies": {
-<<<<<<< HEAD
    "@nomiclabs/hardhat-ethers": "^2.2.3",
    "@nomiclabs/hardhat-waffle": "^2.0.6",
    "chai": "^4.3.7",
    "ethereum-waffle": "^4.0.10",
    "ethers": "^6.5.1",
-=======
    "@nomicfoundation/hardhat-foundry": "^1.0.1",
    "@nomicfoundation/hardhat-verify": "^1.0.1",
    "@nomiclabs/hardhat-ethers": "^2.2.3",
    "ethers": "^5",
->>>>>>> 80078475d5d09a2b730f8334120a524d069ec5b1
    "hardhat": "^2.15.0",
    "ts-node": "^10.9.1",
    "typescript": "^5.1.3"