Resolve conflicts in app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js

d30fcd83 · Constance Okoghenun · 88647de1 · d30fcd83
Commit d30fcd83 authored Feb 22, 2018 by Constance Okoghenun
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 13 deletions

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

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
@@ -75,19 +75,6 @@ export default class FilteredSearchDropdownManager {
        },
        element: this.container.querySelector('#js-dropdown-milestone'),
      },
-<<<<<<< HEAD
-=======
-      label: {
-        reference: null,
-        gl: DropdownNonUser,
-        extraArguments: {
-          endpoint: `${this.baseEndpoint}/labels.json`,
-          symbol: '~',
-          preprocessing: DropdownUtils.duplicateLabelPreprocessing,
-        },
-        element: this.container.querySelector('#js-dropdown-label'),
-      },
->>>>>>> upstream/master
      'my-reaction': {
        reference: null,
        gl: DropdownEmoji,