BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Conflicts fixed

This commit is contained in:
Matias Pando 2014-09-12 14:56:19 -03:00
parent 873f854eb8
commit 0698c70cce
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/controllers/copayers.js
View File

@ -8,11 +8,7 @@ angular.module('copayApp.controllers').controller('CopayersController',
$scope.skipBackup = function() {
var w = $rootScope.wallet;
<<<<<<< HEAD
w.setBackupReady(true);
=======
w.setBackupReady();
>>>>>>> 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
};
$scope.backup = function() {

5
js/models/core/Wallet.js
View File

@ -2433,9 +2433,8 @@ Wallet.prototype.isShared = function() {
* @desc Returns true if the keyring is complete and all users have backed up the wallet
* @return {boolean}
*/
Wallet.prototype.isReady = function() { << << << < HEAD
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin); === === =
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported); >>> >>> > 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
Wallet.prototype.isReady = function() {
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin);
return ret;
};