From 876dd45ba9ab5dbe9c4c1fbffe6321674c71a980 Mon Sep 17 00:00:00 2001
From: Andromachi Rozaki <andromachi.rozaki@camunda.com>
Date: Tue, 27 Feb 2024 16:08:05 +0100
Subject: [PATCH] message

---
 rerun-failed-run/action.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rerun-failed-run/action.yml b/rerun-failed-run/action.yml
index eb0b95fc..30b3a723 100644
--- a/rerun-failed-run/action.yml
+++ b/rerun-failed-run/action.yml
@@ -51,9 +51,6 @@ runs:
       shell: bash
       run: |
         echo ${{ steps.github-token.outputs.token }} | gh auth login --with-token
-<<<<<<< HEAD
-        gh workflow run rerun-failed-run.yml -R camunda/infra-global-github-actions --ref=main -F run_id=${{ inputs.run-id }} -F repository=${{ inputs.repository }} -F error_message=${{ inputs.error-message }}
-=======
         error_messages="${{ inputs.error-messages }}"
         result="["
         IFS=$'\n'
@@ -65,4 +62,3 @@ runs:
         result+="]"
         echo "result: $result"
         gh workflow run rerun-failed-run.yml -R camunda/infra-global-github-actions --ref=gh-672 -F run_id=${{ inputs.run-id }} -F repository=${{ inputs.repository }} -F error_messages=$result
->>>>>>> 51c9d6a (switched to grep -c)