From 47dfdb08107a0dca03c21dff5fc38dfdbcf57269 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Wed, 29 Nov 2023 08:17:36 +0800
Subject: [PATCH] fix(gotosocial): oops

---
 kube/deploy/apps/gotosocial/app/hr.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kube/deploy/apps/gotosocial/app/hr.yaml b/kube/deploy/apps/gotosocial/app/hr.yaml
index bdac4dd2..42c43208 100644
--- a/kube/deploy/apps/gotosocial/app/hr.yaml
+++ b/kube/deploy/apps/gotosocial/app/hr.yaml
@@ -25,11 +25,7 @@ spec:
       repository: "docker.io/superseriousbusiness/gotosocial"
       tag: "0.12.2"
     podLabels:
-<<<<<<< HEAD
       ingress.home.arpa/nginx-public: "allow"
-=======
-      ingress.home.arpa/nginx-internal: "allow"
->>>>>>> e82d9fd0a934f35c2065e2e2bee8641a7d29bc9c
       ingress.home.arpa/cloudflare: "allow"
       db.home.arpa/pg: "pg-gotosocial"
       s3.home.arpa/store: "rgw-${CLUSTER_NAME}"