fix merge bug

This commit is contained in:
Nikolay Volf 2016-01-31 19:01:43 +04:00
parent 5837b6e131
commit b83dd9fe52
1 changed files with 4 additions and 0 deletions

4
.gitmodules vendored
View File

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