From e8584f17c0d2fdef083a3c4b3e983746ed2384cf Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Wed, 4 Feb 2026 14:08:36 +0000
Subject: [PATCH]  git status  rm .github/workflows/crowdsec-integration.yml
 .github/workflows/rate-limit-integration.yml
 .github/workflows/waf-integration.yml .github/workflows/e2e-tests.yml
 fix(ci): add image_tag input for manual triggers in integration workflows

---
 .github/workflows/crowdsec-integration.yml   | 8 ++++++++
 .github/workflows/rate-limit-integration.yml | 8 ++++++++
 .github/workflows/waf-integration.yml        | 2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/crowdsec-integration.yml b/.github/workflows/crowdsec-integration.yml
index 6ea05b29..107757d0 100644
--- a/.github/workflows/crowdsec-integration.yml
+++ b/.github/workflows/crowdsec-integration.yml
@@ -11,7 +11,15 @@ on:
   workflow_dispatch:
     inputs:
       image_tag:
+<<<<<<< HEAD
         description: 'Docker image tag to test (e.g., pr-123-abc1234, latest)'
+=======
+<<<<<<< HEAD
+        description: 'Docker image tag to test (e.g., pr-123-abc1234)'
+=======
+        description: 'Docker image tag to test (e.g., pr-123-abc1234, latest)'
+>>>>>>> 8edde88f (fix(ci): add image_tag input for manual triggers in integration workflows)
+>>>>>>> 05695af2 ( git status)
         required: false
         type: string
 
diff --git a/.github/workflows/rate-limit-integration.yml b/.github/workflows/rate-limit-integration.yml
index 4a0ce173..8bb35e9e 100644
--- a/.github/workflows/rate-limit-integration.yml
+++ b/.github/workflows/rate-limit-integration.yml
@@ -11,7 +11,15 @@ on:
   workflow_dispatch:
     inputs:
       image_tag:
+<<<<<<< HEAD
         description: 'Docker image tag to test (e.g., pr-123-abc1234, latest)'
+=======
+<<<<<<< HEAD
+        description: 'Docker image tag to test (e.g., pr-123-abc1234)'
+=======
+        description: 'Docker image tag to test (e.g., pr-123-abc1234, latest)'
+>>>>>>> 8edde88f (fix(ci): add image_tag input for manual triggers in integration workflows)
+>>>>>>> 05695af2 ( git status)
         required: false
         type: string
 
diff --git a/.github/workflows/waf-integration.yml b/.github/workflows/waf-integration.yml
index f30e0c5e..667f92ec 100644
--- a/.github/workflows/waf-integration.yml
+++ b/.github/workflows/waf-integration.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
     inputs:
       image_tag:
-        description: 'Docker image tag to test (e.g., pr-123-abc1234, latest)'
+        description: 'Docker image tag to test (e.g., pr-123-abc1234)'
         required: false
         type: string