Skip to content

K
k3s
Commit 6986a3b2 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #27091 from mml/union-merge

Automatic merge from submit-queue Mark known-flags to merge via union.
parents 613bbbb1 52f6b273
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
hack/verify-flags/.gitattributes 0 → 100644
View file @ 6986a3b2
known-flags.txt merge=union
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment