commit dfad5d5286235759251bc4d32f7048340f861a96
author Michael Davis <michael.s.davis@ibm.com> Thu Jul 20 14:53:46 2017 -0500
committer Iftekharul Islam <iffy.ryan@ibm.com> Wed Sep 27 11:37:20 2017 -0500
tree e629d5b7f154df396ebac74ee6276952391054e6
parent ec61b2a8f9d00ab4fec9f0a132e9884c4d52f584

created remote console page

TODO: Remove HTERM.

Change-Id: I72026e5ea64c9fba3089b68dfd2b8198255dabb8
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>

app/common/services/userModel.js

diff --git a/app/common/services/userModel.js b/app/common/services/userModel.js
index dba607d..60f718e 100644
--- a/app/common/services/userModel.js
+++ b/app/common/services/userModel.js
@@ -15,9 +15,12 @@
         .module('app.common.services')
         .service('userModel', ['APIUtils',function(APIUtils){
             return {
+<<<<<<< HEAD
                 fakeLogin: function(callback){
                     sessionStorage.setItem('LOGIN_ID', 'FAKE_ID');
                 },
+=======
+>>>>>>> 4c1a3dd... Major update to code structure
                 login : function(username, password, callback){
                     APIUtils.login(username, password, function(response, error){
                         if(response &&