fix merge bug
This commit is contained in:
parent
5837b6e131
commit
b83dd9fe52
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -0,0 +1,4 @@
|
||||
[submodule "ethcore/res/ethereum/tests"]
|
||||
path = ethcore/res/ethereum/tests
|
||||
url = git@github.com:ethereum/tests
|
||||
branch = develop
|
Loading…
Reference in New Issue
Block a user