mirror of
https://github.com/Instadapp/dsa-connectors.git
synced 2024-07-29 22:37:00 +00:00
merge conflicts
This commit is contained in:
parent
5e1b4495f4
commit
9c426d4f27
|
|
@ -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") });
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user