[Fix](client): minore changes after rebase {IA}

theDOMfather · Dec 8, 2016 · 02a5d27 · 02a5d27
1 parent 6ddd09e
commit 02a5d27
Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/client/app/mainList/mainList.html b/client/app/mainList/mainList.html
@@ -21,7 +21,6 @@
   <!-- Add job form -->
   <add-job-dir></add-job-dir>
   <!-- Job list table -->
-<<<<<<< HEAD
    <table class='table table-striped'>
     <thead>
       <tr>

diff --git a/client/app/stats/stats.js b/client/app/stats/stats.js
@@ -1,12 +1,10 @@
 angular.module('jobTracker.stats', [])
-<<<<<<< HEAD
-.controller('StatsController', function($scope, $location) {
+.controller('statsController', function($scope, JobFactory, $filter, AuthFactory, $location) {
 
   $scope.isActive = function(viewLocation) {
     return viewLocation === $location.path();
   };
-=======
-.controller('statsController', function($scope, JobFactory, $filter, AuthFactory) {
+
   $scope.navButton = "Sign out";
   $scope.jobs = [];
   $scope.stats = {};
@@ -64,6 +62,5 @@ angular.module('jobTracker.stats', [])
     });
   }
   $scope.getJobs();
->>>>>>> [STATS](Client): started to redo the status format on JobSchema {IA}
 
 });