Fix merge conflict remnant

2019-05-25 16:25:38 -07:00
parent 4bb1312cf1
commit d79714a3cf
1 changed files with 1 additions and 0 deletions
--- a/contracts/exchange/test/transactions.ts
+++ b/contracts/exchange/test/transactions.ts
@@ -1057,6 +1057,7 @@ describe('Exchange transactions', () => {
                    await exchangeWrapperContract.cancelOrdersUpTo.awaitTransactionSuccessAsync(
                        targetOrderEpoch,
                        cancelTransaction.salt,
+                        cancelTransaction.expirationTimeSeconds,
                        cancelTransaction.signature,
                        { from: makerAddress },
                        constants.AWAIT_TRANSACTION_MINED_MS,