Merge pull request #16892 from jellyfin/Bond-009-mergeconflict

2026-10-21 16:22:15 +00:00 · 2026-05-22 13:38:57 +02:00 · 2026-05-22 13:38:57 +02:00 · 400d7d83bc
commit 400d7d83bc
parent 4ca3cd79fa 17e2d3bb11
1 changed files with 1 additions and 1 deletions
--- a/.github/workflows/pull-request-conflict.yml
+++ b/.github/workflows/pull-request-conflict.yml
@ -4,7 +4,7 @@ on:
  push:
    branches:
      - master
-  pull_request:
+  pull_request_target:
  issue_comment:

 permissions: {}