Fixed ci conflict

061a37a0 · Jan Provaznik · 35cd6ef0 · 061a37a0
Commit 061a37a0 authored Nov 14, 2018 by Jan Provaznik
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
@@ -219,7 +219,6 @@ stages:
 .rspec-metadata-mysql-rails4: &rspec-metadata-mysql-rails4
  <<: *rspec-metadata-mysql
  <<: *rails4
-<<<<<<< HEAD
 .rspec-metadata-ee: &rspec-metadata-ee
  <<: *rspec-metadata
@@ -278,8 +277,6 @@ stages:
 .rspec-geo-pg-10-2-rails4: &rspec-metadata-pg-geo-10-2-rails4
  <<: *rspec-metadata-pg-geo-10-2
  <<: *rails4
-=======
->>>>>>> upstream/master
 .only-canonical-masters: &only-canonical-masters
  only: