change repo

danielleadams · Mar 19, 2023 · 2f362de · diyorbekrustamjonov · May 11, 2023 · 2f362de
1 parent d9f3709
commit 2f362de
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/comment-labeled.yml b/.github/workflows/comment-labeled.yml
@@ -48,11 +48,7 @@ jobs:
   notable-change:
     permissions:
       pull-requests: write
-<<<<<<< HEAD
     if: github.repository == 'danielleadams/node' && github.event_name == 'pull_request_target' && github.event.label.name == 'notable-change'
-=======
-    if: github.repository == 'nodejs/node' && github.event_name == 'pull_request_target' && github.event.label.name == 'notable-change'
->>>>>>> 01d64512a2 (meta: automate description requests when notable change label is added)
     runs-on: ubuntu-latest
     steps:
       - name: Add notable change description