Update release-notes.yml

chipsalliance · Nov 27, 2024 · 0926c32 · 0926c32
1 parent b9efa6c
commit 0926c32
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -18,13 +18,9 @@ on:
 jobs:
   generate_release_notes:
     name: Generate Release Notes
-<<<<<<< HEAD
     runs-on: ubuntu-latest
-=======
-    runs-on: ubuntu-22.04
     permissions:
       contents: write
->>>>>>> 25d00af83 (Update CD permissions for uploading release artifacts (#4529))
 
     steps:
       - name: Checkout