merge fix

This commit is contained in:
Nikolay Volf 2016-01-31 19:04:47 +04:00
parent b83dd9fe52
commit efc70e9f09

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "ethcore/res/ethereum/tests"] [submodule "ethcore/res/ethereum/tests"]
path = ethcore/res/ethereum/tests path = ethcore/res/ethereum/tests
url = git@github.com:ethereum/tests url = git@github.com:ethereum/tests
branch = develop branch = develop