Conflicts solved
This commit is contained in:
parent
63cffcc921
commit
e819073003
2 changed files with 19 additions and 2 deletions
|
|
@ -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 || {};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue