From 8ddb19aade3d880e8d751c2ea17fc4102d7fcbbd Mon Sep 17 00:00:00 2001
From: GomathiselviS <gomathiselvi@gmail.com>
Date: Mon, 26 Jan 2026 11:22:13 -0800
Subject: [PATCH] Fix cherry-pick spillover

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
---
 tests/integration/targets/helm/tasks/main.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/integration/targets/helm/tasks/main.yml b/tests/integration/targets/helm/tasks/main.yml
index df436fa8..497bf575 100644
--- a/tests/integration/targets/helm/tasks/main.yml
+++ b/tests/integration/targets/helm/tasks/main.yml
@@ -6,8 +6,5 @@
   with_items:
     - "v3.15.4"
     - "v3.16.0"
-<<<<<<< HEAD
-=======
     - "v3.17.0"
     - "v4.0.0"
->>>>>>> 13791ec (Limit compatibility to Helm =>v3.0.0,<4.0.0 (#1039))