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/system-overview-controller.js

diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js
index 5468d6f..7ec73e3 100644
--- a/app/overview/controllers/system-overview-controller.js
+++ b/app/overview/controllers/system-overview-controller.js
@@ -1,5 +1,9 @@
 /**
+<<<<<<< HEAD
  * Controller for systemOverview
+=======
+ * Controller for system overview
+>>>>>>> 4c1a3dd... Major update to code structure
  *
  * @module app/overview
  * @exports systemOverviewController
@@ -17,6 +21,7 @@
             '$window', 
             'APIUtils', 
             'dataService',
+<<<<<<< HEAD
             function($scope, $window, APIUtils, dataService){
                 $scope.dataService = dataService;
                 $scope.dropdown_selected = false;
@@ -80,8 +85,16 @@
                     APIUtils.setLEDState(toggleState, function(status){
                     });
                 }
+=======
+            function($scope, $window, APIUtils, dataService, userModel){
+                $scope.dataService = dataService;
+>>>>>>> 4c1a3dd... Major update to code structure
             }
         ]
     );
 
-})(angular);
\ No newline at end of file
+<<<<<<< HEAD
+})(angular);
+=======
+})(angular);
+>>>>>>> 4c1a3dd... Major update to code structure