solving merge issues

dashboard/v2/public/modules/home/homeRoutes.js

@@ -25,7 +25,8 @@ angular.module('dgc.home.routes', []).config(['$stateProvider',
         // states for my app
         $stateProvider.state('home', {
             url: '/search',
-            templateUrl: '/modules/search/views/search.html'
+            templateUrl: '/modules/search/views/search.html',
+            controller: 'SearchController'
         });
     }
 ]);

dashboard/v2/public/modules/navigation/navigationController.js

@@ -21,7 +21,6 @@
 angular.module('dgc.navigation').controller('NavigationController', ['$scope', 'NavigationResource',
     function($scope, NavigationResource) {
 
-
         $scope.leftnav= NavigationResource.get();
         $scope.updateVar = function(event) {
             $scope.$$prevSibling.query = angular.element(event.target).text();
@@ -29,4 +28,4 @@ angular.module('dgc.navigation').controller('NavigationController', ['$scope', '
         };
 
     }
-]);
+]);
\ No newline at end of file

dashboard/v2/public/modules/navigation/navigationModule.js

@@ -17,4 +17,5 @@
  */
 
 'use strict';
-angular.module('dgc.navigation',[]);
+
+angular.module('dgc.navigation',[]);
\ No newline at end of file

dashboard/v2/public/modules/navigation/navigationResource.js

@@ -20,7 +20,7 @@
 
 angular.module('dgc.navigation').factory('NavigationResource', ['$resource', function($resource) {
     return $resource('api/metadata/types?type=TRAIT', {}, {
-        get: {
+      get: {
             'method': 'GET',
             'responseType': 'json',
             'isArray': true,

dashboard/v2/public/modules/search/searchController.js

@@ -39,7 +39,6 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
             NotificationService.reset();
             $scope.limit = 4;
             SearchResource.search({query:query}, function searchSuccess(response) {
-
                 $scope.resultCount=response.count;
                 $scope.results = response.results;
                 $scope.resultRows = $scope.results.rows;

dashboard/v2/public/modules/search/searchRoutes.js

@@ -27,13 +27,9 @@ angular.module('dgc.search').config(['$stateProvider',
             templateUrl: '/modules/search/views/search.html',
             controller: 'SearchController'
         }).state('search.results', {
-            url: '/:query',
-            templateUrl: '/modules/search/views/searchResult.html',
-            controller: 'SearchController'
-        }).state('search.results', {
             url: '?query',
             templateUrl: '/modules/search/views/searchResult.html',
-            controller:'SearchController'
+            controller: 'SearchController'
       });
     }
 ]);

dashboard/v2/public/modules/search/views/searchResult.html

@@ -41,7 +41,7 @@
         <div data-ng-if="!searchTypesAvailable" data-ng-include="'/modules/search/views/types/guid.html'"></div>
     </li>
 </ul>
-<div ng-show='results.rows.length > 0'>
+<div ng-show='searchTypesAvailable'>
     <pagination total-items="totalItems" items-per-page="itemsPerPage" ng-model="currentPage" ng-change="pageChanged()"></pagination>
     <p>
 </div>