Resolve conflicts from "Repo by URL" CI/CD projects

From
(EE) https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4642
(CE backport)
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17342

app/views/projects/new.html.haml

@@ -19,12 +19,9 @@
       %p
         = _('All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings.')
       -# EE-specific start
-<<<<<<< HEAD
       - if ci_cd_projects_available?
         %p
           = _('To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>.').html_safe
-=======
->>>>>>> upstream/master
       -# EE-specific end
       .md
         = brand_new_project_guidelines
@@ -50,10 +47,7 @@
             %span.hidden-xs Import project
             %span.visible-xs Import
         -# EE-specific start
-<<<<<<< HEAD
         = render 'new_ci_cd_only_project_tab', active_tab: active_tab
-=======
->>>>>>> upstream/master
         -# EE-specific end
 
       .tab-content.gitlab-tab-content
@@ -122,10 +116,7 @@
 
 
         -# EE-specific start
-<<<<<<< HEAD
         = render 'new_ci_cd_only_project_pane', active_tab: active_tab
-=======
->>>>>>> upstream/master
         -# EE-specific end
 
 .save-project-loader.hide

app/views/shared/_import_form.html.haml

@@ -11,7 +11,6 @@
     %ul
       %li
         = _('The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.').html_safe
-<<<<<<< HEAD
       %li
         = _('If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.').html_safe
       %li
@@ -27,14 +26,4 @@
 
 -# EE-specific start
 = render 'shared/ee/import_form', f: f unless ci_cd_only
-=======
-      %li
-        = _('If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.').html_safe
-      %li
-        = import_will_timeout_message(ci_cd_only)
-      %li
-        = import_svn_message(ci_cd_only)
-
--# EE-specific start
->>>>>>> upstream/master
 -# EE-specific end

doc/user/project/import/repo_by_url.md

@@ -10,7 +10,6 @@ You can import your existing repositories by providing the Git URL:
 1. Once complete, you will be redirected to your newly created project
 
 ![Import project by repo URL](img/import_projects_from_repo_url.png)
-<<<<<<< HEAD
 
 ## CI/CD for external repositories
 
@@ -29,5 +28,3 @@ but [can be re-enabled later on](../settings/index.md#sharing-and-permissions).
 
 [ee-4642]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4642
 [eep]: https://about.gitlab.com/products/
-=======
->>>>>>> upstream/master