3
0
mirror of https://github.com/mastodon/chart synced 2025-03-15 13:31:51 +00:00

Rebase cleanup

This commit is contained in:
Tim Campbell 2025-03-06 15:44:35 +01:00
parent 576645712a
commit 9a846e7640

View File

@ -6,14 +6,7 @@ dependencies:
repository: oci://registry-1.docker.io/bitnamicharts repository: oci://registry-1.docker.io/bitnamicharts
version: 14.2.3 version: 14.2.3
- name: redis - name: redis
<<<<<<< HEAD
repository: oci://registry-1.docker.io/bitnamicharts repository: oci://registry-1.docker.io/bitnamicharts
version: 18.16.1 version: 18.16.1
digest: sha256:684daaf2067d96e2aa6d93e9d29b7b13fc586f6ae929342e5e9c7c169b1c0748 digest: sha256:684daaf2067d96e2aa6d93e9d29b7b13fc586f6ae929342e5e9c7c169b1c0748
generated: "2024-02-23T15:14:47.536480528-08:00" generated: "2024-02-23T15:14:47.536480528-08:00"
=======
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
version: 16.13.2
digest: sha256:8be2c8069d65f295d0079bdda67c45691370f7bef73393c2e80eedbdd748b9af
generated: "2023-09-29T16:46:40.462499+02:00"
>>>>>>> 740ed27 (Allow custom nodeSelector for each resource)