merge conflicts

This commit is contained in:
pk1411 2022-03-08 11:02:29 +05:30
parent 5e1b4495f4
commit 9c426d4f27

View File

@ -13,12 +13,9 @@ import { HardhatUserConfig } from "hardhat/config";
import { NetworkUserConfig } from "hardhat/types";
import { utils } from "ethers";
import Web3 from "web3";
<<<<<<< HEAD
import "./scripts/tests/tests-run"
=======
import { network } from "hardhat";
>>>>>>> origin/main
dotenvConfig({ path: resolve(__dirname, "./.env") });