rebase
This commit is contained in:
parent
c42205c1de
commit
cb576baef0
|
@ -588,10 +588,8 @@ API.prototype.parseTxProposals = function(txData, cb) {
|
|||
}, function(err, wcd) {
|
||||
if (err) return cb(err);
|
||||
|
||||
<< << << < HEAD
|
||||
var txps = txData.txps;
|
||||
_processTxps(txps, wcd.sharedEncryptingKey); === === =
|
||||
_processTxps(txps, data.sharedEncryptingKey); >>> >>> > bit - history
|
||||
_processTxps(txps, wcd.sharedEncryptingKey);
|
||||
|
||||
var fake = _.any(txps, function(txp) {
|
||||
return (!Verifier.checkTxProposal(wcd, txp));
|
||||
|
|
Loading…
Reference in New Issue