summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2025-09-20 09:22:55 +0200
committerGitHub <noreply@github.com>2025-09-20 09:22:55 +0200
commit83bc4273d5848b7ddd241662fd566d7b76cec4a9 (patch)
treed990cc0a27669f34d6cf7880c4f8117c9d811a58 /.github/workflows
parentbdb8e4ff6501ba5fd0dd6479d48b816a7e8086fb (diff)
parente62f2e6c63a0a39eb164a7c8c8a4bbe6db8aded1 (diff)
downloadvyos-build-83bc4273d5848b7ddd241662fd566d7b76cec4a9.tar.gz
vyos-build-83bc4273d5848b7ddd241662fd566d7b76cec4a9.zip
Merge pull request #1037 from kumvijaya/current
T7748: Updated conflict reusable workflow reference in workflow
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/check-pr-conflicts.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index 6cca61e8..f09e6641 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -10,5 +10,5 @@ permissions:
jobs:
check-pr-conflict-call:
- uses: vyos/.github/.github/workflows/check-pr-conflict.yml@current
+ uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
secrets: inherit