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/constants.js

diff --git a/app/common/services/constants.js b/app/common/services/constants.js
index a610ba9..0db039f 100644
--- a/app/common/services/constants.js
+++ b/app/common/services/constants.js
@@ -20,8 +20,12 @@
                     password: "testpass",
                 },
                 API_CREDENTIALS: {
+<<<<<<< HEAD
                     host: 'https://9.3.181.15',
                     mock_host: 'http://localhost:3000'
+=======
+                    host: 'https://9.3.164.147'
+>>>>>>> 4c1a3dd... Major update to code structure
                 },
                 API_RESPONSE: {
                     ERROR_STATUS: 'error',
@@ -44,6 +48,7 @@
                     off: -1,
                     booting: 0,
                     unreachable: -2
+<<<<<<< HEAD
                 },
                 LED_STATE: {
                     on: true,
@@ -78,8 +83,14 @@
                   'xyz.openbmc_project.Sensor.Value.Unit.Watts': 'watts',
                   'xyz.openbmc_project.Sensor.Value.Unit.Amperes': 'amperes',
                   'xyz.openbmc_project.Sensor.Value.Unit.Joules': 'joules'
+=======
+>>>>>>> 4c1a3dd... Major update to code structure
                 }
             };
         });
 
+<<<<<<< HEAD
 })(window.angular);
+=======
+})(window.angular);
+>>>>>>> 4c1a3dd... Major update to code structure