From a0d034b84e4493e2743db1ccc06d7ae17a851524 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin <godfat@godfat.org> Date: Tue, 17 Jul 2018 21:24:48 +0800 Subject: [PATCH] Resolve more conflicts in .gitlab-ci.yml --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eac7d2bca3b..1506d8088e0 100644 --- 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 -- 2.30.9