github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,347 Commits 1 Branch 31 Tags
8ff4e96cee58054748ae3772641dffd07a7c1c08
Commit Graph

1 Commits

Author SHA1 Message Date
Matt Liggett
52f6b27365 Mark known-flags to merge via union. 
This avoids pointless merge conflicts in a simple text file.
Fixes #27088.
 2016-06-08 15:59:35 -07:00