Source Code added

2026-02-02 14:56:38 +01:00 · 2026-02-02 14:56:38 +01:00 · 3f20680501
commit 3f20680501
parent ac679f452a
477 changed files with 25051 additions and 2 deletions
--- a/.github/workflows/repo-merge-conflict.yaml
+++ b/.github/workflows/repo-merge-conflict.yaml
@ -0,0 +1,18 @@
+name: Repo / Label merge conflict
+
+on:
+  push:
+  pull_request_target:
+    types:
+      - synchronize
+
+jobs:
+  triage:
+    name: Triage
+    runs-on: ubuntu-22.04
+    if: ${{ contains(github.repository_owner, 'jellyfin') }}
+    steps:
+      - uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
+        with:
+          dirtyLabel: merge conflict
+          repoToken: ${{ secrets.JF_BOT_TOKEN }}