Resolve conflict in filtered_search_dropdown_manager.js

f98569f2 · Winnie Hellmann · 36019301 · f98569f2
Commit f98569f2 authored Sep 27, 2018 by Winnie Hellmann
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js ...ripts/filtered_search/filtered_search_dropdown_manager.js +7 -7

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,19 +97,19 @@ export default class FilteredSearchDropdownManager {
        gl: NullDropdown,
        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: {
        reference: null,
        gl: DropdownWeight,
        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 => {