created remote console page
TODO: Remove HTERM.
Change-Id: I72026e5ea64c9fba3089b68dfd2b8198255dabb8
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/styles/index.scss b/app/styles/index.scss
index ee88ea0..c3ab7ab 100644
--- a/app/styles/index.scss
+++ b/app/styles/index.scss
@@ -2,8 +2,12 @@
@import "../common/styles/index.scss";
@import "../login/styles/index.scss";
+<<<<<<< HEAD
@import "../overview/styles/index.scss";
@import "../server-control/styles/index.scss";
@import "../server-health/styles/index.scss";
@import "../configuration/styles/index.scss";
-@import "../users/styles/index.scss";
\ No newline at end of file
+@import "../users/styles/index.scss";
+=======
+@import "../overview/styles/index.scss";
+>>>>>>> 4c1a3dd... Major update to code structure