upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-02-03 20:40:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

1
hack/verify-flags/.gitattributes vendored
View file

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

1
test/.gitattributes vendored
View file

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