no message

2024-02-27 18:23:53 +01:00 · 2024-02-27 18:23:53 +01:00 · e1163036b8
parent 923ad8a082
commit e1163036b8
1 changed files with 0 additions and 4 deletions
--- 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