Fix up filtered search CE upstream conflicts

app/assets/javascripts/boards/boards_bundle.js

@@ -86,11 +86,7 @@ $(() => {
       gl.boardService = new BoardService(this.endpoint, this.bulkUpdatePath, this.boardId);
       Store.rootPath = this.endpoint;
 
-<<<<<<< HEAD
       this.filterManager = new FilteredSearchBoards(Store.filter, true, [(this.milestoneTitle ? 'milestone' : null)]);
-=======
-      this.filterManager = new FilteredSearchBoards(Store.filter, true);
->>>>>>> upstream/master
       this.filterManager.setup();
 
       // Listen for updateTokens event

app/assets/javascripts/boards/filtered_search_boards.js

@@ -11,10 +11,6 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager {
     // Issue boards is slightly different, we handle all the requests async
     // instead or reloading the page, we just re-fire the list ajax requests
     this.isHandledAsync = true;
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master
     this.cantEdit = cantEdit;
   }