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

This commit is contained in:
Ryan Hitchman 2016-11-02 09:48:45 -07:00
parent 9980291736
commit 955f31353d
3 changed files with 2 additions and 2 deletions

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
hack/verify-flags/known-flags.txt merge=union
test/test_owners.csv merge=union

View File

@ -1 +0,0 @@
known-flags.txt merge=union

1
test/.gitattributes vendored
View File

@ -1 +0,0 @@
test_owners.csv merge=union