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

ea659729 · Ian Baum · 572e10e8 · ea659729
Commit ea659729 authored Feb 07, 2018 by Ian Baum
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
@@ -73,14 +73,11 @@ class FilteredSearchDropdownManager {
        gl: 'DropdownEmoji',
        element: this.container.querySelector('#js-dropdown-my-reaction'),
      },
-<<<<<<< HEAD
      weight: {
        reference: null,
        gl: 'DropdownNonUser',
        element: this.container.querySelector('#js-dropdown-weight'),
      },
-=======
->>>>>>> upstream/master
    };

    supportedTokens.forEach((type) => {