Commit 1c9ee90e authored by Stan Hu's avatar Stan Hu

Resolve conflicts in app/assets/javascripts/pages/groups/issues/index.js

parent f65684f8
...@@ -6,10 +6,7 @@ import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_to ...@@ -6,10 +6,7 @@ import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_to
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
initFilteredSearch({ initFilteredSearch({
page: FILTERED_SEARCH.ISSUES, page: FILTERED_SEARCH.ISSUES,
<<<<<<< HEAD
filteredSearchTokenKeys: FilteredSearchTokenKeysIssues, filteredSearchTokenKeys: FilteredSearchTokenKeysIssues,
=======
>>>>>>> upstream/master
isGroupDecendent: true, isGroupDecendent: true,
}); });
projectSelect(); projectSelect();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment