Resolve conflicts in app/assets/javascripts/dispatcher.js

app/views/search/_category.html.haml

@@ -78,7 +78,6 @@
           Milestones
           %span.badge
             = limited_count(@search_results.limited_milestones_count)
-<<<<<<< HEAD
       - if current_application_settings.elasticsearch_search?
         %li{ class: active_when(@scope == 'blobs') }
           = link_to search_filter_path(scope: 'blobs') do
@@ -95,5 +94,3 @@
             Wiki
             %span.badge
               = limited_count(@search_results.wiki_blobs_count)
-=======
->>>>>>> upstream/master