Skip to content

G
gitlab-ce
Commit f98569f2 authored by Winnie Hellmann's avatar Winnie Hellmann
Browse files
Options

Resolve conflict in filtered_search_dropdown_manager.js

parent 36019301
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
View file @ f98569f2
...@@ -97,19 +97,19 @@ export default class FilteredSearchDropdownManager { ...@@ -97,19 +97,19 @@ export default class FilteredSearchDropdownManager {
gl: NullDropdown, gl: NullDropdown,
element: this.container.querySelector('#js-dropdown-admin-runner-status'), element: this.container.querySelector('#js-dropdown-admin-runner-status'),
}, },
<<<<<<< HEAD type: {
reference: null,
gl: NullDropdown,
element: this.container.querySelector('#js-dropdown-admin-runner-type'),
},
// EE-only start
weight: { weight: {
reference: null, reference: null,
gl: DropdownWeight, gl: DropdownWeight,
element: this.container.querySelector('#js-dropdown-weight'), element: this.container.querySelector('#js-dropdown-weight'),
=======
type: {
reference: null,
gl: NullDropdown,
element: this.container.querySelector('#js-dropdown-admin-runner-type'),
>>>>>>> upstream/master
}, },
// EE-only end
}; };
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