summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2025-09-18 11:30:24 +0100
committerGitHub <noreply@github.com>2025-09-18 11:30:24 +0100
commit02c32914f60b4cbda4470967afe120325188bc28 (patch)
tree918cb4ab04bc7b5453453a51f075b07d483d423d /.github/workflows
parent69d0a7499f4990c33c8d186763288dae7d2756a6 (diff)
parent913c9cc08d1b13ef86e0a2f737ae8d9d16dc29cc (diff)
downloadvyos-1x-02c32914f60b4cbda4470967afe120325188bc28.tar.gz
vyos-1x-02c32914f60b4cbda4470967afe120325188bc28.zip
Merge pull request #4727 from kumvijaya/current
T7746: updated conflict 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 6cca61e8d..f09e66415 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