From 768dfefe3af8d16a916381aff4102d27ecedcfb5 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 4 Aug 2014 07:16:22 -0300
Subject: [PATCH] wallet working again

---
 js/models/core/TxProposals.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/models/core/TxProposals.js b/js/models/core/TxProposals.js
index 7fe68b7b9..7885509d1 100644
--- a/js/models/core/TxProposals.js
+++ b/js/models/core/TxProposals.js
@@ -69,7 +69,7 @@ TxProposals.prototype.merge = function(inObj, builderOpts) {
   if (myTxps[ntxid]) {
 
     // Merge an existing txProposal
-    ret.hasChanged = myTxps[ntxid].merge(incomingTx, allowedPubKeys);
+    ret.hasChanged = myTxps[ntxid].merge(incomingTx);
 
 
   } else {