Resolved .gitlab-ci.yml merge conflict

f2cde435 · Yorick Peterse · ddd41853 · f2cde435
Commit f2cde435 authored Dec 04, 2018 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

.gitlab-ci.yml .gitlab-ci.yml +0 -3

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1221,10 +1221,7 @@ merge:master:
      - $MERGE_TRAIN_SSH_PUBLIC_KEY
      - $MERGE_TRAIN_SSH_PRIVATE_KEY
      - $MERGE_TRAIN_API_TOKEN
-<<<<<<< HEAD
-=======
      - $MERGE_FORCE_ENABLE
->>>>>>> upstream/master
  script:
    - scripts/merge-train
  cache: