Change to fix-linting for consistency

nf-core · Jul 28, 2023 · 49fb85d · 49fb85d
1 parent a10564d
commit 49fb85d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/fix-linting.yml b/.github/workflows/fix-linting.yml
@@ -5,11 +5,7 @@ on:
     types: [created]
 
 jobs:
-<<<<<<< HEAD
   fix-linting:
-=======
-  fix_linting:
->>>>>>> 568afbcc2 (Rename and tidy all GHA workflows for branch protection)
     # Only run if comment is on a PR with the main repo, and if it contains the magic keywords
     if: >
       contains(github.event.comment.html_url, '/pull/') &&