From e1163036b8424d4db176068baa6ff090fbb993e4 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Date: Tue, 27 Feb 2024 18:23:53 +0100
Subject: [PATCH] no message

---
 charts/stable/prowlarr/Chart.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/charts/stable/prowlarr/Chart.yaml b/charts/stable/prowlarr/Chart.yaml
index 328f37f813d..d9f5c9d24c6 100644
--- a/charts/stable/prowlarr/Chart.yaml
+++ b/charts/stable/prowlarr/Chart.yaml
@@ -37,8 +37,4 @@ sources:
   - https://ghcr.io/onedr0p/prowlarr-develop
   - https://ghcr.io/onedr0p/exportarr
 type: application
-<<<<<<< HEAD
 version: 15.3.1
-=======
-version: 15.3.0
->>>>>>> ca4edb9ed17108ac4d6f5ec3b1651d62b566e672