From 8a8ae5b357abeccb8ac7ca7ca67b72f7ebd12361 Mon Sep 17 00:00:00 2001
From: MattFaus <mattfaus@khanacademy.org>
Date: Tue, 11 Mar 2014 23:14:42 -0700
Subject: [PATCH] Fix merge problem

---
 test/test.Transaction.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.Transaction.js b/test/test.Transaction.js
index ba5843cc1..b16f13899 100644
--- a/test/test.Transaction.js
+++ b/test/test.Transaction.js
@@ -324,7 +324,7 @@ describe('Transaction', function() {
   });
 
   // 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);
     if (!testTx) return;
     var transactionString = buffertools.toHex(