summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/_new_submit.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/merge_requests/_new_submit.html.haml')
-rw-r--r--app/views/projects/merge_requests/_new_submit.html.haml1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 3a670cb70dd..bfe461e6943 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -18,7 +18,6 @@
= f.hidden_field :target_branch
.mr-compare.merge-request
-<<<<<<< 4a8cb230c6ba28ccdcd6da91855005e4fa0c46bf
- if @commits.empty?
.commits-empty
%h4