Skip avoid waiting for other copayers

2014-09-12 13:29:41 -03:00 · 2014-09-12 13:29:41 -03:00 · 873f854eb8
commit 873f854eb8
parent b7373367a1 6703652ea9
2 changed files with 8 additions and 2 deletions
--- a/js/controllers/copayers.js
+++ b/js/controllers/copayers.js
@ -8,7 +8,11 @@ angular.module('copayApp.controllers').controller('CopayersController',

    $scope.skipBackup = function() {
      var w = $rootScope.wallet;
+<<<<<<< HEAD
      w.setBackupReady(true);
+=======
+      w.setBackupReady();
+>>>>>>> 6703652ea9d7e9e8c9a137a735b2fc2fc6de2494
    };

    $scope.backup = function() {