From 474dc5269243192f2149aad11804408b627874b7 Mon Sep 17 00:00:00 2001
From: Xavier <zavier.tremblay@gmail.com>
Date: Tue, 26 Sep 2023 13:27:20 -0400
Subject: [PATCH] Merge main

---
 .github/workflows/jira.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml
index 9d2faed..f2f9188 100644
--- a/.github/workflows/jira.yml
+++ b/.github/workflows/jira.yml
@@ -13,11 +13,7 @@ jobs:
       shell: pwsh
       run: |
             Install-Module JiraPS -Scope CurrentUser -Force
-<<<<<<< HEAD
             if ("$env:GITHUB_HEAD_REF" -like "*renovate/*" -eq $True)
-=======
-            if ("$env:GITHUB_HEAD_REF" -like "*/renovate/*" -eq $True)
->>>>>>> main
             {
               Write-Host "Skipping, renovate branch detected"
               return