Commit f1766434 authored by Clement Ho's avatar Clement Ho

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

parent 3535b92e
...@@ -12,19 +12,11 @@ ...@@ -12,19 +12,11 @@
= form_tag personal_access_token_import_gitea_path do = form_tag personal_access_token_import_gitea_path do
.form-group.row .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' = label_tag :gitea_host_url, 'Gitea Host URL', class: 'col-form-label col-sm-8'
.col-sm-4 .col-sm-4
= text_field_tag :gitea_host_url, nil, placeholder: 'https://try.gitea.io', class: 'form-control' = text_field_tag :gitea_host_url, nil, placeholder: 'https://try.gitea.io', class: 'form-control'
.form-group.row .form-group.row
= label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label col-sm-8' = label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label col-sm-8'
>>>>>>> gitlab-ce/master
.col-sm-4 .col-sm-4
= text_field_tag :personal_access_token, nil, class: 'form-control' = text_field_tag :personal_access_token, nil, class: 'form-control'
.form-actions .form-actions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment