Commit a5aabf4e authored by Clement Ho's avatar Clement Ho

Fix conflict in app/views/projects/new.html.haml

parent 4b35ef88
...@@ -46,12 +46,9 @@ ...@@ -46,12 +46,9 @@
%a{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab' }, role: 'tab' } %a{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab' }, role: 'tab' }
%span.d-none.d-sm-block Import project %span.d-none.d-sm-block Import project
%span.d-block.d-sm-none Import %span.d-block.d-sm-none Import
<<<<<<< HEAD
-# EE-specific start -# EE-specific start
= render 'new_ci_cd_only_project_tab', active_tab: active_tab = render 'new_ci_cd_only_project_tab', active_tab: active_tab
-# EE-specific end -# EE-specific end
=======
>>>>>>> gitlab-ce/master
.tab-content.gitlab-tab-content .tab-content.gitlab-tab-content
.tab-pane{ id: 'blank-project-pane', class: active_when(active_tab == 'blank'), role: 'tabpanel' } .tab-pane{ id: 'blank-project-pane', class: active_when(active_tab == 'blank'), role: 'tabpanel' }
...@@ -74,15 +71,11 @@ ...@@ -74,15 +71,11 @@
%h4 No import options available %h4 No import options available
%p Contact an administrator to enable options for importing your project. %p Contact an administrator to enable options for importing your project.
<<<<<<< HEAD
-# EE-specific start -# EE-specific start
= render 'new_ci_cd_only_project_pane', active_tab: active_tab = render 'new_ci_cd_only_project_pane', active_tab: active_tab
-# EE-specific end -# EE-specific end
.save-project-loader.hide
=======
.save-project-loader.d-none .save-project-loader.d-none
>>>>>>> gitlab-ce/master
.center .center
%h2 %h2
%i.fa.fa-spinner.fa-spin %i.fa.fa-spinner.fa-spin
......
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