wallet working again
This commit is contained in:
parent
4cf152999a
commit
768dfefe3a
1 changed files with 1 additions and 1 deletions
|
|
@ -69,7 +69,7 @@ TxProposals.prototype.merge = function(inObj, builderOpts) {
|
||||||
if (myTxps[ntxid]) {
|
if (myTxps[ntxid]) {
|
||||||
|
|
||||||
// Merge an existing txProposal
|
// Merge an existing txProposal
|
||||||
ret.hasChanged = myTxps[ntxid].merge(incomingTx, allowedPubKeys);
|
ret.hasChanged = myTxps[ntxid].merge(incomingTx);
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue