anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

rebase

Browse source
This commit is contained in:
Javier 2016-06-02 11:09:40 -03:00
commit dd382de0dd
5 changed files with 10 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/js/controllers/disclaimer.js
View file

@ -1,12 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('disclaimerController',
<<<<<<< e68d1d87ec5d6c817929721a32f43cefc88aa290
function($scope, $timeout, $log, profileService, applicationService, gettextCatalog, uxLanguage, go) {
=======
function($scope, $timeout, $log, $ionicSideMenuDelegate, profileService, isCordova, applicationService, gettextCatalog, uxLanguage, go) {
>>>>>>> do not allow drag side bar in disclaimer screen
function($scope, $timeout, $log, $ionicSideMenuDelegate, profileService, applicationService, gettextCatalog, uxLanguage, go) {
var self = this;
self.tries = 0;
$scope.creatingProfile = true;