commit | dfad5d5286235759251bc4d32f7048340f861a96 | [log] [tgz] |
---|---|---|
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 [diff] [blame] |
created remote console page TODO: Remove HTERM. Change-Id: I72026e5ea64c9fba3089b68dfd2b8198255dabb8 Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/overview/controllers/log-controller.js b/app/overview/controllers/log-controller.js index b952893..3dfd2e4 100644 --- a/app/overview/controllers/log-controller.js +++ b/app/overview/controllers/log-controller.js
@@ -19,8 +19,11 @@ 'dataService', function($scope, $window, APIUtils, dataService, userModel){ $scope.dataService = dataService; +<<<<<<< HEAD $scope.dropdown_selected = false; +======= +>>>>>>> 4c1a3dd... Major update to code structure } ] );