Resolve conflict in top nav search

9d8d1042 · Eric Eastwood · f99b9cc3 · 9d8d1042
Commit 9d8d1042 authored Dec 12, 2017 by Eric Eastwood
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

app/views/layouts/_search.html.haml app/views/layouts/_search.html.haml +0 -7

No files found.
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -18,17 +18,10 @@
                                            spellcheck: false,
                                            tabindex: '1',
                                            autocomplete: 'off',
-<<<<<<< HEAD
-                                            data: { toggle: 'dropdown',
-                                              issues_path: issues_dashboard_path,
-                                              mr_path: merge_requests_dashboard_path },
-                                            aria: { label: 'Search' }
-=======
                                            data: { issues_path: issues_dashboard_path,
                                              mr_path: merge_requests_dashboard_path },
                                            aria: { label: 'Search' }
          %button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } }
->>>>>>> upstream/master
          .dropdown-menu.dropdown-select
            = dropdown_content do
              %ul