Remove remnant from conflict

3bbf2e30 · Achilleas Pipinellis · 4abda548 · 3bbf2e30
Commit 3bbf2e30 authored Sep 05, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/views/projects/_merge_request_settings.html.haml app/views/projects/_merge_request_settings.html.haml +0 -1

No files found.
--- a/app/views/projects/_merge_request_settings.html.haml
+++ b/app/views/projects/_merge_request_settings.html.haml
-<<<<<<< HEAD
 %fieldset.merge-request-feature.append-bottom-default
  %h5.prepend-top-0
    Merge requests