Fix merge problem

This commit is contained in:
MattFaus 2014-03-11 23:14:42 -07:00
parent 4ad36b4fb8
commit 8a8ae5b357
1 changed files with 1 additions and 1 deletions

View File

@ -324,7 +324,7 @@ describe('Transaction', function() {
}); });
// Verify that known invalid transactions are interpretted correctly // Verify that known invalid transactions are interpretted correctly
test_data.dataTxInvalid.forEach(function(datum) { testdata.dataTxInvalid.forEach(function(datum) {
var testTx = parse_test_transaction(datum); var testTx = parse_test_transaction(datum);
if (!testTx) return; if (!testTx) return;
var transactionString = buffertools.toHex( var transactionString = buffertools.toHex(