Do not show backupFlag if email not confirmed

js/controllers/import.js

@@ -73,7 +73,6 @@ angular.module('copayApp.controllers').controller('ImportController',
         $scope.importOpts.skipFields = skipFields;
 
 
-      << << << < HEAD
       if (backupFile) {
         reader.readAsBinaryString(backupFile);
       } else {
@@ -87,12 +86,4 @@ angular.module('copayApp.controllers').controller('ImportController',
         });
       }
     };
-  }); === === =
-if (backupFile) {
-  reader.readAsBinaryString(backupFile);
-} else {
-  $scope._doImport(backupText, $scope.password);
-  copay.Compatibility.deleteOldWallet(backupOldWallet);
-}
-};
-}); >>> >>> > Added needBackup flag when importing a wallet
+  });

js/models/Identity.js

@@ -576,9 +576,9 @@ Identity.prototype.createWallet = function(opts, cb) {
   self.bindWallet(w);
   self.updateFocusedTimestamp(w.getId());
   self.storeWallet(w, function(err) {
-    if (err) return cb(err); << << << < HEAD === === =
+    if (err) return cb(err);
 
-    self.backupNeeded = true; >>> >>> > Added the flag backupNeeded
+    self.backupNeeded = true;
     self.store({
       noWallets: true,
     }, function(err) {