From efc70e9f09b594b3bcb6afa49f7bfd5dc33e36e7 Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Sun, 31 Jan 2016 19:04:47 +0400 Subject: [PATCH] merge fix --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 0105f1024..95ac098ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +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 + branch = develop \ No newline at end of file