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

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

@@ -11,10 +11,7 @@ import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_to
 document.addEventListener('DOMContentLoaded', () => {
   initFilteredSearch({
     page: FILTERED_SEARCH.ISSUES,
-<<<<<<< HEAD
     filteredSearchTokenKeys: FilteredSearchTokenKeysIssues,
-=======
->>>>>>> upstream/master
   });
   new IssuableIndex(ISSUABLE_INDEX.ISSUE);