Resolve conflicts with EE-specific markers

app/views/ci/variables/_variable_row.html.haml

@@ -43,11 +43,8 @@
           %span.toggle-icon
             = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
             = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
-<<<<<<< HEAD
       -# EE-specific start
       = render 'ci/variables/environment_scope', form_field: form_field, variable: variable
       -# EE-specific end
-=======
->>>>>>> upstream/master
   %button.js-row-remove-button.ci-variable-row-remove-button{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
     = icon('minus-circle')

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

@@ -22,13 +22,10 @@
     = text_field_tag :personal_access_token, '', class: 'form-control', placeholder: _('Personal Access Token'), size: 40
     = submit_tag _('List your GitHub repositories'), class: 'btn btn-success'
 
-<<<<<<< HEAD
   -# EE-specific start
   = hidden_field_tag :ci_cd_only, params[:ci_cd_only]
   -# EE-specific end
 
-=======
->>>>>>> upstream/master
 - unless github_import_configured?
   %hr
   %p

app/views/projects/new.html.haml

@@ -18,14 +18,11 @@
         = _('A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}.').html_safe % { among_other_things_link: among_other_things_link }
       %p
         = _('All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings.')
-<<<<<<< HEAD
       -# EE-specific start
       - 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
       -# EE-specific end
-=======
->>>>>>> upstream/master
       .md
         = brand_new_project_guidelines
       %p
@@ -49,12 +46,9 @@
           %a{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab' }, role: 'tab' }
             %span.hidden-xs Import project
             %span.visible-xs Import
-<<<<<<< HEAD
         -# EE-specific start
         = render 'new_ci_cd_only_project_tab', active_tab: active_tab
         -# EE-specific end
-=======
->>>>>>> upstream/master
 
       .tab-content.gitlab-tab-content
         .tab-pane{ id: 'blank-project-pane', class: active_when(active_tab == 'blank'), role: 'tabpanel' }
@@ -120,14 +114,10 @@
                       = render "shared/import_form", f: f
                       = render 'new_project_fields', f: f, project_name_id: "import-url-name"
 
-<<<<<<< HEAD
-
         -# EE-specific start
         = render 'new_ci_cd_only_project_pane', active_tab: active_tab
         -# EE-specific end
 
-=======
->>>>>>> upstream/master
 .save-project-loader.hide
   .center
     %h2

app/views/shared/_import_form.html.haml

@@ -17,7 +17,6 @@
         = import_will_timeout_message(ci_cd_only)
       %li
         = import_svn_message(ci_cd_only)
-<<<<<<< HEAD
       %li
         The Git LFS objects will be ignored.
       - unless ci_cd_only
@@ -28,5 +27,3 @@
 -# EE-specific start
 = render 'shared/ee/import_form', f: f unless ci_cd_only
 -# EE-specific end
-=======
->>>>>>> upstream/master

spec/javascripts/fixtures/projects.rb

@@ -17,12 +17,9 @@ describe 'Projects (JavaScript fixtures)', type: :controller do
   end
 
   before do
-<<<<<<< HEAD
     # EE-specific start
     stub_licensed_features(variable_environment_scope: true)
     # EE specific end
-=======
->>>>>>> upstream/master
     project.add_master(admin)
     sign_in(admin)
   end