UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit a42613fc authored by Chukwuka Akagbusi's avatar Chukwuka Akagbusi
Browse files

fix conflict

parent 9b3a0442
No related branches found
No related tags found
5 merge requests!225update registry1.dso.mil/ironbank/hashicorp/vault/vault-k8s docker tag to v1.6.2,!222chore(deps): update ironbank to v1.18.5,!221chore(deps): update ironbank to v1.18.4,!217chore(deps): update ironbank to v1.18.3,!211Update Ironbank
Pipeline #3780903 failed
Stage: ⚙️ configuration validation
Stage: 🤞 package tests
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
chart/Chart.yaml
+ 0
− 4
View file @ a42613fc
......@@ -23,11 +23,7 @@ sources:
- https://github.com/hashicorp/vault-csi-provider
dependencies:
- name: minio-instance
<<<<<<< HEAD
version: 6.0.3-bb.2
=======
version: 6.0.4-bb.2
>>>>>>> origin/renovate/ironbank
alias: minio
condition: minio.enabled
repository: oci://registry1.dso.mil/bigbang
......
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

UNCLASSIFIED - NO CUI