Conflicts solved

This commit is contained in:
Matias Pando 2014-09-11 10:28:56 -03:00
commit e819073003
2 changed files with 19 additions and 2 deletions

View file

@ -87,7 +87,7 @@ function Wallet(opts) {
this.lastMessageFrom = {};
//to avoid confirmation of copayer's backups if is imported from a file
this.isImported = opts.isImported;
this.isImported = opts.isImported || false;
this.paymentRequests = opts.paymentRequests || {};