Skip to content

Commit 43f0e20

Browse files
committed
remove unnecessary OR
1 parent ad72ae0 commit 43f0e20

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

.github/policies/auto-merge.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ configuration:
1616
label: ':octocat: auto-merge'
1717
- targetsBranch:
1818
branch: main
19-
- or:
20-
- isActivitySender:
21-
user: dotnet-policy-service[bot]
22-
- isActivitySender:
23-
user: dotnet-policy-service
19+
- isActivitySender:
20+
user: dotnet-policy-service[bot]
2421
then:
2522
- enableAutoMerge:
2623
mergeMethod: Squash
@@ -35,11 +32,8 @@ configuration:
3532
label: ':octocat: auto-merge'
3633
- targetsBranch:
3734
branch: live
38-
- or:
39-
- isActivitySender:
40-
user: dotnet-policy-service[bot]
41-
- isActivitySender:
42-
user: dotnet-policy-service
35+
- isActivitySender:
36+
user: dotnet-policy-service[bot]
4337
then:
4438
- enableAutoMerge:
4539
mergeMethod: Merge

0 commit comments

Comments
 (0)