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

app/assets/javascripts/boards/filtered_search_boards.js

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