Merge pull request #36075 from rmmh/root-gitattributes

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.

Merge pull request #36075 from rmmh/root-gitattributes
539165d8 · Kubernetes Submit Queue · GitHub · 09a42622 · 955f3135 · 539165d8
Commit 539165d8 authored Nov 02, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitattributes .gitattributes +2 -0

.gitattributes hack/verify-flags/.gitattributes +0 -1

.gitattributes test/.gitattributes +0 -1

No files found.
--- a/.gitattributes
+++ b/.gitattributes
+hack/verify-flags/known-flags.txt merge=union
+test/test_owners.csv merge=union
--- a/hack/verify-flags/.gitattributes
+++ b/hack/verify-flags/.gitattributes
-known-flags.txt merge=union
--- a/test/.gitattributes
+++ b/test/.gitattributes
-test_owners.csv merge=union