Merge main

gsoft-inc · Sep 26, 2023 · 474dc52 · 474dc52
1 parent dc9ccea
commit 474dc52
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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