Resolve more conflicts in .gitlab-ci.yml

a0d034b8 · Lin Jen-Shin · 5b381ff7 · a0d034b8
Commit a0d034b8 authored Jul 17, 2018 by Lin Jen-Shin
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
@@ -594,7 +594,6 @@ danger-review:
    - git version
    - danger --fail-on-errors=true
-<<<<<<< HEAD
 # EE jobs
 rspec-pg-ee 0 2: *rspec-ee-pg
 rspec-pg-ee 1 2: *rspec-ee-pg
@@ -611,8 +610,6 @@ rspec-pg-geo-rails5 0 2: *rspec-metadata-pg-geo-9-6-rails5
 rspec-pg-geo-rails5 1 2: *rspec-metadata-pg-geo-10-2-rails5
 ## EE jobs
-=======
->>>>>>> upstream/master
 rspec-pg 0 30: *rspec-metadata-pg
 rspec-pg 1 30: *rspec-metadata-pg
 rspec-pg 2 30: *rspec-metadata-pg