Resolving conflict with app/assets/javascripts/pages/groups/issues/index.js

app/assets/javascripts/pages/groups/issues/index.js

@@ -6,10 +6,7 @@ import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_to
 export default () => {
   initFilteredSearch({
     page: FILTERED_SEARCH.ISSUES,
-<<<<<<< HEAD
     filteredSearchTokenKeys: FilteredSearchTokenKeysIssues,
-=======
->>>>>>> upstream/master
   });
   projectSelect();
 };