rebase

10 years ago · cb576baef0
1 changed files with 1 additions and 3 deletions
--- a/lib/client/api.js
+++ b/lib/client/api.js
@ -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));