Skip to content

Commit 74c1f07

Browse files
authored
Merge pull request #1025 from kumvijaya/current
T7748: conflict check workflow updated to use marketplace action along with increased wait/retry
2 parents 891f333 + 185b7da commit 74c1f07

2 files changed

Lines changed: 1 addition & 18 deletions

File tree

.github/workflows/check-open-prs-conflict.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/check-pr-conflicts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ permissions:
1010

1111
jobs:
1212
check-pr-conflict-call:
13-
uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
13+
uses: vyos/.github/.github/workflows/check-pr-conflict.yml@current
1414
secrets: inherit

0 commit comments

Comments
 (0)