aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>2022-11-03 15:00:58 +0000
committerGitHub <noreply@github.com>2022-11-03 15:00:58 +0000
commita01b0960d3e7f840043d6ca152b1ec4645105ace (patch)
tree0b54a6e9211fba548397cb1d35362a2923ea33bc
parentc306428f2ca647529875e6542e234b3364e09e0c (diff)
chore(deps): update eps1lon/actions-label-merge-conflict action to v2.1.0
-rw-r--r--.github/workflows/automation.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml
index 01cd41a08..0989df64b 100644
--- a/.github/workflows/automation.yml
+++ b/.github/workflows/automation.yml
@@ -14,7 +14,7 @@ jobs:
if: ${{ github.repository == 'jellyfin/jellyfin' }}
steps:
- name: Apply label
- uses: eps1lon/actions-label-merge-conflict@b8bf8341285ec9a4567d4318ba474fee998a6919 # tag=v2.0.1
+ uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # tag=v2.1.0
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
with:
dirtyLabel: 'merge conflict'