x/kloudbuster
Code Issues Proposed changes

Delete words added by mistake

Browse Source 
Change-Id: Ic76e1b8bc2e2da55aa592a47eb623237de6a0a33
This commit is contained in:
Xin 2015-12-01 12:01:19 -08:00
parent 3e5ec183e5
commit 00f8049442
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kb_web/app/scripts/controllers/login.js
View File

@ -175,11 +175,7 @@ angular.module('kbWebApp')
$scope.setConfig = function () {
if ($scope.samecloud === true) {
kbCookie.setIsOneCloud(true);
<<<<<<< HEAD
$scope.credentials = { "tested-passwd": $scope.inputPassword1, "tested-rc": test_rc};
=======
$scope.credentials = {"tested-passwd": $scope.inputPassword1, "tested-rc": test_rc};
>>>>>>> 0b002f3... UI development
}
else {
kbCookie.setIsOneCloud(false);

4
kb_web/bower.json
View File

@ -20,11 +20,7 @@
"angular-material": "~0.11.4"
},
"devDependencies": {
<<<<<<< HEAD
"angular-mocks": "^1.4.5"
=======
"angular-mocks": "~1.4.5"
>>>>>>> 0b002f3... UI development
},
"appPath": "app",
"moduleName": "kbWebApp",