diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-02 18:52:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-02 18:52:56 +0800 |
| commit | 64f35ba8d1f31d6821a0a1bf946c71396a996f30 (patch) | |
| tree | 375a081536c7c0b329a3b0c2e812ff05f81dd64c /tests/files/VMTests/vmtests.json | |
| parent | 616066a598933df7ef126186eb9c647094f665ca (diff) | |
| parent | 99481a245adc2c4814ab6b38d94d63114f7bbb15 (diff) | |
| download | go-tangerine-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.gz go-tangerine-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.zst go-tangerine-64f35ba8d1f31d6821a0a1bf946c71396a996f30.zip | |
merge errors fixed
Diffstat (limited to 'tests/files/VMTests/vmtests.json')
| -rw-r--r-- | tests/files/VMTests/vmtests.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/files/VMTests/vmtests.json b/tests/files/VMTests/vmtests.json index bdaee2bd2..bd2fa6fa2 100644 --- a/tests/files/VMTests/vmtests.json +++ b/tests/files/VMTests/vmtests.json @@ -27,6 +27,8 @@ "value" : "1000000000000000000" }, "gas" : "9949", + "logs" : { + }, "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -93,6 +95,8 @@ "value" : "1000000000000000000" }, "gas" : "9824", + "logs" : { + }, "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -141,6 +145,8 @@ "value" : "1000000000000000000" }, "gas" : "9971", + "logs" : { + }, "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -183,6 +189,8 @@ "value" : "1000000000000000000" }, "gas" : "9999", + "logs" : { + }, "out" : "0x", "post" : { "cd1722f3947def4cf144679da39c4c32bdc35681" : { |