From b83dd9fe52cabfc279d561cf19de86de5814bd8b Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Sun, 31 Jan 2016 19:01:43 +0400 Subject: [PATCH] fix merge bug --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index e69de29bb..0105f1024 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "ethcore/res/ethereum/tests"] + path = ethcore/res/ethereum/tests + url = git@github.com:ethereum/tests + branch = develop \ No newline at end of file