Commit 53056102 authored by Stan Hu's avatar Stan Hu

Resolve conflict with .gitlab-ci.yml

parent ad663560
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment