wallet working again

This commit is contained in:
Matias Alejo Garcia 2014-08-04 07:16:22 -03:00
commit 768dfefe3a

View file

@ -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 {