From cb98f4ce831f490e5e85f1cb12b46ab9cb28c7f4 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 2 Oct 2015 16:14:09 -0300
Subject: [PATCH] Fix conflict

---
 src/js/controllers/paperWallet.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index 85d839259..29d45a73f 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -1,10 +1,9 @@
 angular.module('copayApp.controllers').controller('paperWalletController',
-  function($scope, $http, $timeout, $rootScope, profileService, go, addressService, isCordova, gettext, bitcore) {
+  function($scope, $http, $timeout, profileService, go, addressService, isCordova, bitcore) {
     self = this;
     var fc = profileService.focusedClient;
     var rawTx;
-
-    if (isCordova) self.message = "Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open."
+    self.isCordova = isCordova;
 
     self.onQrCodeScanned = function(data) {
       $scope.privateKey = data;