Update conflicts.yml (#3009)

* Update conflicts.yml * Delete dummy-conflicts.yml
FreeTubeApp · Dec 30, 2022 · e2c4cf4 · e2c4cf4
1 parent 8b0711f
commit e2c4cf4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -7,9 +7,6 @@ on:
   # In `pull_request` we wouldn't be able to change labels of fork PRs
   pull_request_target:
     types: [synchronize]
-  workflow_run:
-    workflows: ['Dummy workflow for conflicts']
-    types: [requested]
 
 jobs:
   main:
@@ -23,3 +20,4 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
           commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
+
diff --git a/.github/workflows/dummy-conflicts.yml b/.github/workflows/dummy-conflicts.yml