Resolve conflict with .gitlab-ci.yml

53056102 · Stan Hu · ad663560 · 53056102
Commit 53056102 authored Jan 24, 2018 by Stan Hu
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
@@ -345,11 +345,8 @@ setup-test-env:
    paths:
      - tmp/tests

-<<<<<<< HEAD
 rspec-pg geo: *rspec-metadata-pg-geo

-=======
->>>>>>> upstream/master
 rspec-pg 0 27: *rspec-metadata-pg
 rspec-pg 1 27: *rspec-metadata-pg
 rspec-pg 2 27: *rspec-metadata-pg