Skip to content

G
gitlab-ce
Commit d723b18c authored by Ian Baum's avatar Ian Baum
Browse files
Options

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

parent 9dbcb3f7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/pages/projects/issues/index/index.js
View file @ d723b18c
...@@ -11,10 +11,7 @@ import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_to ...@@ -11,10 +11,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
}); });
new IssuableIndex(ISSUABLE_INDEX.ISSUE); new IssuableIndex(ISSUABLE_INDEX.ISSUE);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7