Fix Conflicts:

js/controllers/join.js
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-06 18:55:44 -03:00
commit fd030ecbfb
5 changed files with 7 additions and 2 deletions

View file

@ -1,9 +1,9 @@
'use strict';
angular.module('copayApp.controllers').controller('JoinController',
function($scope, $rootScope, $timeout, $location, walletFactory, controllerUtils, Passphrase, notification) {
function($scope, $rootScope, $timeout, walletFactory, controllerUtils, Passphrase, notification) {
controllerUtils.redirIfLogged();
$rootScope.fromSetup = false;
$scope.loading = false;
// QR code Scanner