Fix conflict in app/views/import/gitea/new.html.haml

app/views/import/gitea/new.html.haml

@@ -12,19 +12,11 @@
 
 = form_tag personal_access_token_import_gitea_path do
   .form-group.row
-<<<<<<< HEAD
-    = label_tag :gitea_host_url, 'Gitea Host URL', class: 'col-form-label'
-    .col-sm-4
-      = text_field_tag :gitea_host_url, nil, placeholder: 'https://try.gitea.io', class: 'form-control'
-  .form-group.row
-    = label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label'
-=======
     = label_tag :gitea_host_url, 'Gitea Host URL', class: 'col-form-label col-sm-8'
     .col-sm-4
       = text_field_tag :gitea_host_url, nil, placeholder: 'https://try.gitea.io', class: 'form-control'
   .form-group.row
     = label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label col-sm-8'
->>>>>>> gitlab-ce/master
     .col-sm-4
       = text_field_tag :personal_access_token, nil, class: 'form-control'
   .form-actions