anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix conflics

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-13 19:45:00 -03:00
commit 194e5fed54
7 changed files with 55 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/models/core/TxProposals.js
View file

@ -24,6 +24,8 @@ function TxProposal(opts) {
}
TxProposal.prototype.toObj = function() {
console.log('[TxProposals.js.27]',this); //TODO
var o = JSON.parse(JSON.stringify(this));
delete o['builder'];
o.builderObj = this.builder.toObj();