From 2505ec8f1a26a7c967cb42b28a2814f80dc75ac5 Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Wed, 12 Mar 2025 15:06:36 +0100 Subject: [PATCH] Cleanup from merge --- values.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/values.yaml b/values.yaml index c361786..5ead550 100644 --- a/values.yaml +++ b/values.yaml @@ -97,11 +97,7 @@ mastodon: nodeSelector: {} # Custom labels to add to kubernetes resources #labels: -<<<<<<< HEAD -======= - # -- deploy search to elastsicsearch. Requires .elasticsearch.enabled = true ->>>>>>> main cron: # -- run `tootctl media remove` every week removeMedia: