• Filipa Lacerda's avatar
    Fix conflicts for: · 3ecdd280
    Filipa Lacerda authored
     - app/assets/javascripts/dispatcher.js
     - app/assets/javascripts/project_find_file.js
     - app/assets/javascripts/render_gfm.js
     - app/assets/javascripts/search.js
     - app/assets/javascripts/search_autocomplete.js
     - app/assets/stylesheets/pages/merge_requests.scss
     - spec/javascripts/search_autocomplete_spec.js
    3ecdd280
search_autocomplete.js 13.4 KB