Fix lcli merge conflicts

This commit is contained in:
pawanjay176
2020-04-28 18:21:52 +05:30
parent 19436d4ad7
commit 47124ca404
7 changed files with 111 additions and 49 deletions

View File

@@ -21,7 +21,7 @@ regex = "1.3.1"
eth1_test_rig = { path = "../tests/eth1_test_rig" }
futures = {version = "0.3", features = ["compat"]}
environment = { path = "../lighthouse/environment" }
web3 = "0.8.0"
web3 = "0.10.0"
eth2_testnet_config = { path = "../eth2/utils/eth2_testnet_config" }
dirs = "2.0"
genesis = { path = "../beacon_node/genesis" }