Update filtered_search_dropdown_manager.js

75b61bcf · Grzegorz Bizon · b3280fb1 · 75b61bcf
Commit 75b61bcf authored Sep 14, 2018 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js ...ripts/filtered_search/filtered_search_dropdown_manager.js +0 -3

No files found.
--- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
@@ -97,15 +97,12 @@ export default class FilteredSearchDropdownManager {
        gl: NullDropdown,
        element: this.container.querySelector('#js-dropdown-admin-runner-status'),
      },
-<<<<<<< HEAD

      weight: {
        reference: null,
        gl: DropdownWeight,
        element: this.container.querySelector('#js-dropdown-weight'),
      },
-=======
->>>>>>> upstream/master
    };

    supportedTokens.forEach(type => {