Commit 4953e172 authored by clabby's avatar clabby

resolve conflicts

parent 02052f09
......@@ -99,7 +99,7 @@ FaultDisputeGame_ResolvesCorrectly_IncorrectRoot2:test_resolvesCorrectly_succeed
FaultDisputeGame_ResolvesCorrectly_IncorrectRoot3:test_resolvesCorrectly_succeeds() (gas: 655691)
FaultDisputeGame_ResolvesCorrectly_IncorrectRoot4:test_resolvesCorrectly_succeeds() (gas: 656629)
FaultDisputeGame_ResolvesCorrectly_IncorrectRoot5:test_resolvesCorrectly_succeeds() (gas: 656080)
FaultDisputeGame_Test:test_addLocalData_static_succeeds() (gas: 642385)
FaultDisputeGame_Test:test_addLocalData_static_succeeds() (gas: 642005)
FaultDisputeGame_Test:test_createdAt_succeeds() (gas: 10388)
FaultDisputeGame_Test:test_extraData_succeeds() (gas: 32363)
FaultDisputeGame_Test:test_gameData_succeeds() (gas: 32878)
......@@ -690,3 +690,4 @@ TransactorTest:test_constructor_succeeds() (gas: 9673)
TransactorTest:test_delegateCall_succeeds() (gas: 20931)
TransactorTest:test_delegateCall_unauthorized_reverts() (gas: 18124)
TransferOnionTest:test_constructor_succeeds() (gas: 564789)
TransferOnionTest:test_unwrap_succeeds() (gas: 724955)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment