From fbb5e943cb03e1c90f67783569d9a436528a4e45 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 23 Jan 2014 17:38:30 -0300
Subject: [PATCH] fix conflicts

---
 app/controllers/transactions.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/transactions.js b/app/controllers/transactions.js
index 94d2ba3..b4c9379 100644
--- a/app/controllers/transactions.js
+++ b/app/controllers/transactions.js
@@ -43,7 +43,13 @@ var getTransaction = function(txid, cb) {
       return cb(err);
     }
 
-    if (!tx) return cb(new Error('Transaction not found'));
+    if (!tx) {
+console.log('[transactions.js.48]:: TXid %d not found in RPC. CHECK THIS.', txid); //TODO
+      // not check this. no
+      tx.info = {
+        txid: txid,
+      };
+    }
 
     return cb(null, tx.info);
   });