Resolve conflicts in app/assets/javascripts/boards/filtered_search_boards.js

app/assets/javascripts/boards/filtered_search_boards.js

@@ -7,11 +7,8 @@ export default class FilteredSearchBoards extends FilteredSearchManager {
   constructor(store, updateUrl = false, cantEdit = []) {
     super({
       page: 'boards',
-<<<<<<< HEAD
       filteredSearchTokenKeys: FilteredSearchTokenKeysIssues,
       stateFiltersSelector: '.issues-state-filters',
-=======
->>>>>>> upstream/master
     });
 
     this.store = store;