Resolve conflicts in .gitlab-ci.yml

2bb1d07b · Stan Hu · c79d06ce · 2bb1d07b
Commit 2bb1d07b authored Sep 04, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

.gitlab-ci.yml .gitlab-ci.yml +0 -4

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,11 +201,7 @@ stages:
    - '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}'
    - '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}'
    - scripts/gitaly-test-spawn
-<<<<<<< HEAD
    - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag ~geo"
-=======
-    - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml"
->>>>>>> upstream/master
  artifacts:
    expire_in: 31d
    when: always