[geode] branch mass-test-run updated: removing merge issue.

[mh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/mass-test-run by this push:
     new d0e9b0c  removing merge issue.
d0e9b0c is described below

commit d0e9b0ca8c9eb1cfba2457e48d28b4cdd7874b8c
Author: Mark Hanson <mh...@pivotal.io>
AuthorDate: Thu Apr 30 11:10:28 2020 -0700

    removing merge issue.
---
 ci/pipelines/geode-build/jinja.template.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index e4b65b0..9ad9a08 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -157,23 +157,6 @@ resource_types:
   source:
     repository: frodenas/gcs-resource
 jobs:
-<<<<<<< HEAD
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-    params: { bump: {{ semverPiece }},
-              pre: ((semver-prerelease-token)),
-              pre_without_version: true }
-  - put: geode-build-version
-    params:
-      file: geode-build-version/number
-{% endfor %}
-=======
-
-
->>>>>>> Mass-test-run branch, no windows or publication jobs
 - name: {{build_test.name}}
   public: true
   max_in_flight: {{build_test.MAX_IN_FLIGHT}}