-
Kubernetes Submit Queue authored
Automatic merge from submit-queue Move .gitattributes annotation to the root, so GitHub will respect them. This should fix the merge conflicts by letting GitHub use the simpler line-by-line algorithm for this file. Having .gitattributes in a sub-directory would work for local merging, but would show conflicts on the web UI.
539165d8
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| exceptions.txt | ||
| excluded-flags.txt | ||
| known-flags.txt |