BTCPrivate
/
bitcore-wallet-service
mirror of https://github.com/BTCPrivate/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rebase

This commit is contained in:
Ivan Socolsky 2015-02-23 17:18:35 -03:00
parent c42205c1de
commit cb576baef0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/client/api.js
View File

@ -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));