Fix conflicts in app/views/shared/issuable/form/_merge_params.html.haml

460f60fa · Nick Thomas · 0ab753fa · 460f60fa
Commit 460f60fa authored Jun 16, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

app/views/shared/issuable/form/_merge_params.html.haml app/views/shared/issuable/form/_merge_params.html.haml +0 -7

No files found.
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -3,13 +3,6 @@
 - return unless issuable.is_a?(MergeRequest)
 - return if issuable.closed_without_fork?

-<<<<<<< HEAD
-# This check is duplicated below to avoid CE -> EE merge conflicts.
-# This comment and the following line should only exist in CE.
- return unless issuable.can_remove_source_branch?(current_user)
-
-=======
->>>>>>> upstream/master
 - if issuable.can_remove_source_branch?(current_user)
  .form-group
    .col-sm-10.col-sm-offset-2