mirror of https://github.com/BTCPrivate/copay.git
wallet working again
This commit is contained in:
parent
4cf152999a
commit
768dfefe3a
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue