Skip to content

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

Resolving conflict with app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js

parent 572e10e8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
View file @ ea659729
...@@ -73,14 +73,11 @@ class FilteredSearchDropdownManager { ...@@ -73,14 +73,11 @@ class FilteredSearchDropdownManager {
gl: 'DropdownEmoji', gl: 'DropdownEmoji',
element: this.container.querySelector('#js-dropdown-my-reaction'), element: this.container.querySelector('#js-dropdown-my-reaction'),
}, },
<<<<<<< HEAD
weight: { weight: {
reference: null, reference: null,
gl: 'DropdownNonUser', gl: 'DropdownNonUser',
element: this.container.querySelector('#js-dropdown-weight'), element: this.container.querySelector('#js-dropdown-weight'),
}, },
=======
>>>>>>> upstream/master
}; };
supportedTokens.forEach((type) => { supportedTokens.forEach((type) => {
......
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