|
@ -950,7 +950,6 @@ TransactionBuilder.prototype._mergeTx = function(tx, ignoreConflictingSignatures |
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TransactionBuilder.prototype.merge = function(b) { |
|
|
TransactionBuilder.prototype.merge = function(b) { |
|
|
this._checkMergeability(b); |
|
|
this._checkMergeability(b); |
|
|
|
|
|
|
|
@ -964,8 +963,4 @@ TransactionBuilder.prototype.merge = function(b) { |
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
module.exports = require('soop')(TransactionBuilder); |
|
|
module.exports = require('soop')(TransactionBuilder); |
|
|
|
|
|
|
|
|