diff options
| author | Gav Wood <i@gavwood.com> | 2015-05-24 20:58:03 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2015-05-24 20:58:03 +0800 |
| commit | 44312a5a288c9078c8b27d86164ef0bdd6c48201 (patch) | |
| tree | 396ef3791de6c3913ac2ecb6dbc79783112b8f02 | |
| parent | ca92b231cd41506f3303363edbb7a0f887cb621b (diff) | |
| parent | 4440eeb2c9d1d476d36cd400701afc39e95ef319 (diff) | |
| download | tangerine-tests-44312a5a288c9078c8b27d86164ef0bdd6c48201.tar tangerine-tests-44312a5a288c9078c8b27d86164ef0bdd6c48201.tar.gz tangerine-tests-44312a5a288c9078c8b27d86164ef0bdd6c48201.tar.bz2 tangerine-tests-44312a5a288c9078c8b27d86164ef0bdd6c48201.tar.lz tangerine-tests-44312a5a288c9078c8b27d86164ef0bdd6c48201.tar.xz tangerine-tests-44312a5a288c9078c8b27d86164ef0bdd6c48201.tar.zst tangerine-tests-44312a5a288c9078c8b27d86164ef0bdd6c48201.zip | |
Merge branch 'develop' of github.com:/ethereum/tests into develop
Conflicts:
KeyStoreTests/basic_tests.json
| -rw-r--r-- | KeyStoreTests/basic_tests.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/KeyStoreTests/basic_tests.json b/KeyStoreTests/basic_tests.json index 680e830b9..fd677d9ee 100644 --- a/KeyStoreTests/basic_tests.json +++ b/KeyStoreTests/basic_tests.json @@ -64,7 +64,7 @@ "mac": "39b054110eeebb2bd0ef1df2808878bb579a6145be8b69d7234177801eb8b8af", "cipher": "aes-128-ctr" }, - "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6" + "id": "4216d9d6-9d2c-da0f-b848-270c0403a85f" }, "password": "foo", "priv": "0101010101010101010101010101010101010101010101010101010101010101" |