Resolve _mirror_repos_form.html.haml conflicts

app/views/projects/mirrors/_mirror_repos_form.html.haml

@@ -11,11 +11,7 @@
 
 .form-group
   = label_tag :auth_method, _('Authentication method'), class: 'label-bold'
-<<<<<<< HEAD
-  = select_tag :auth_method, options_for_select([[[_('None'), 'none'], [_('Password'), 'password']], 'none'), { class: "form-control js-auth-method" }
-=======
   = select_tag :auth_method, options_for_select([[_('None'), 'none'], [_('Password'), 'password']], 'none'), { class: "form-control js-auth-method" }
->>>>>>> upstream/master
 
 .form-group.js-password-group.collapse
   = label_tag :password, _('Password'), class: 'label-bold'