mirror of https://github.com/BTCPrivate/copay.git
Conflicts fixed
This commit is contained in:
parent
873f854eb8
commit
0698c70cce
|
@ -8,11 +8,7 @@ angular.module('copayApp.controllers').controller('CopayersController',
|
||||||
|
|
||||||
$scope.skipBackup = function() {
|
$scope.skipBackup = function() {
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
<<<<<<< HEAD
|
|
||||||
w.setBackupReady(true);
|
w.setBackupReady(true);
|
||||||
=======
|
|
||||||
w.setBackupReady();
|
|
||||||
>>>>>>> 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
|
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.backup = function() {
|
$scope.backup = function() {
|
||||||
|
|
|
@ -2433,9 +2433,8 @@ Wallet.prototype.isShared = function() {
|
||||||
* @desc Returns true if the keyring is complete and all users have backed up the wallet
|
* @desc Returns true if the keyring is complete and all users have backed up the wallet
|
||||||
* @return {boolean}
|
* @return {boolean}
|
||||||
*/
|
*/
|
||||||
Wallet.prototype.isReady = function() { << << << < HEAD
|
Wallet.prototype.isReady = function() {
|
||||||
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin); === === =
|
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin);
|
||||||
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported); >>> >>> > 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
|
|
||||||
return ret;
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue