Files
kubernetes/hack
Kubernetes Submit Queue 539165d899 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.
2016-11-02 12:13:54 -07:00
..
2016-10-27 15:06:08 +02:00
2016-10-27 17:25:10 -07:00
2016-10-31 11:13:43 -04:00
2016-07-12 21:52:54 -07:00
2016-07-12 21:52:00 -07:00
2016-10-24 18:00:08 -07:00
2016-08-02 10:27:29 -04:00
2016-07-12 21:52:00 -07:00
2016-10-24 17:10:47 -07:00
2016-10-31 11:13:43 -04:00
2016-07-12 21:52:00 -07:00
2016-10-24 17:10:47 -07:00
2016-10-19 09:47:21 -04:00