This repository has been archived by the owner on Sep 21, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Remove reference to Pivotal Cloud Foundry"
This reverts commit 9c063b9. - These three commits were in an attempt to resolve a merge conflict when doing a `git merge release-candidate`. The modified file, templates/cf-mysql-template.yml, no longer exists on release-candidate and thus auto-merging in the pipeline was failing.
- Loading branch information
Showing
1 changed file
with
1 addition
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters