Move .gitattributes annotation to the root, so GitHub will respect them.

955f3135 · Ryan Hitchman · 99802917 · 955f3135 · 99802917 · 99802917
Commit 955f3135 authored Nov 02, 2016 by Ryan Hitchman
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