Resolve .gitlab-ci.yml

Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab-ci.yml

@@ -282,17 +282,6 @@ static-analysis:
   <<: *except-docs
   stage: test
   script:
-<<<<<<< HEAD
-    - bundle exec "rubocop --require rubocop-rspec"
-
-rake haml_lint: *exec
-rake scss_lint: *exec
-rake config_lint: *exec
-rake brakeman: *exec
-rake flay: *exec
-license_finder: *exec
-rake downtime_check: *exec
-=======
     - scripts/static-analysis
 
 downtime_check:
@@ -303,27 +292,6 @@ downtime_check:
     - /^[\d-]+-stable(-ee)?$/
     - /^docs\/*/
 
-ee_compat_check:
-  <<: *rake-exec
-  only:
-    - branches@gitlab-org/gitlab-ce
-  except:
-    - master
-    - tags
-    - /^[\d-]+-stable(-ee)?$/
-  allow_failure: yes
-  cache:
-    key: "ee_compat_check_repo"
-    paths:
-      - ee_compat_check/ee-repo/
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
-    when: on_failure
-    expire_in: 10d
-    paths:
-      - ee_compat_check/patches/*.patch
->>>>>>> ce-com/master
-
 .db-migrate-reset: &db-migrate-reset
   stage: test
   <<: *dedicated-runner
@@ -438,17 +406,6 @@ docs:check:links:
     # Check the internal links
     - bundle exec nanoc check internal_links
 
-<<<<<<< HEAD
-bundler:check:
-  stage: test
-  <<: *dedicated-runner
-  <<: *ruby-static-analysis
-  <<: *except-docs
-  script:
-   - bundle check
-
-=======
->>>>>>> ce-com/master
 bundler:audit:
   stage: test
   <<: *ruby-static-analysis
@@ -507,17 +464,6 @@ coverage:
     - coverage/index.html
     - coverage/assets/
 
-<<<<<<< HEAD
-lint:javascript:
-  <<: *dedicated-runner
-  <<: *except-docs
-  stage: test
-  before_script: []
-  script:
-    - yarn run eslint
-
-=======
->>>>>>> ce-com/master
 lint:javascript:report:
   <<: *dedicated-runner
   <<: *except-docs