summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2025-09-20 09:23:10 +0200
committerGitHub <noreply@github.com>2025-09-20 09:23:10 +0200
commit023155cdf815e37f99bb54bafbe1482d41146940 (patch)
tree68cc20fc2e7f6d884af6ec8c04e41edb3a1ef514 /.github
parentdf14155ac393858f6df004db03540739430ae66e (diff)
parentb651b8d892dbc26ca2fc6902a8960a55915be212 (diff)
downloadvyatta-bash-023155cdf815e37f99bb54bafbe1482d41146940.tar.gz
vyatta-bash-023155cdf815e37f99bb54bafbe1482d41146940.zip
Merge pull request #19 from kumvijaya/current
T7748: Updated conflict reusable workflow reference in workflow
Diffstat (limited to '.github')
-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 cbe9e0e..a17d31c 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -9,5 +9,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