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/overview/controllers/log-controller.html

diff --git a/app/overview/controllers/log-controller.html b/app/overview/controllers/log-controller.html
index 47429f5..74d74aa 100644
--- a/app/overview/controllers/log-controller.html
+++ b/app/overview/controllers/log-controller.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <div id="event-log">
     <div class="row column">
         <h1>Event Log</h1>
@@ -419,4 +420,9 @@
         </div>
     </section>
     <paginate ng-include="paginate"></paginate>
-</div> <!-- end event log -->
\ No newline at end of file
+</div> <!-- end event log -->
+=======
+<div id="uid-log">
+    Log contents here
+</div>
+>>>>>>> 4c1a3dd... Major update to code structure