Update .gitlab-ci.yml to fix merge conflict

c6d8cfa7 · Zeger-Jan van de Weg · 8d579016 · c6d8cfa7
Commit c6d8cfa7 authored Nov 06, 2017 by Zeger-Jan van de Weg
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -5

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -479,11 +479,7 @@ db:migrate:reset-mysql:
  variables:
    SETUP_DB: "false"
  script:
-<<<<<<< HEAD
-    - git fetch origin v9.3.0-ee
-=======
-    - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0
->>>>>>> ce-com/master
+    - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0-ee
    - git checkout -f FETCH_HEAD
    - bundle install $BUNDLE_INSTALL_FLAGS
    - cp config/gitlab.yml.example config/gitlab.yml