From 955f31353d0d995f13ea3f676ccb029bd785c6c8 Mon Sep 17 00:00:00 2001 From: Ryan Hitchman Date: Wed, 2 Nov 2016 09:48:45 -0700 Subject: [PATCH] Move .gitattributes annotation to the root, so GitHub will respect them. --- .gitattributes | 2 ++ hack/verify-flags/.gitattributes | 1 - test/.gitattributes | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 .gitattributes delete mode 100644 hack/verify-flags/.gitattributes delete mode 100644 test/.gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..9b659e8dac9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +hack/verify-flags/known-flags.txt merge=union +test/test_owners.csv merge=union diff --git a/hack/verify-flags/.gitattributes b/hack/verify-flags/.gitattributes deleted file mode 100644 index c04e4626951..00000000000 --- a/hack/verify-flags/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -known-flags.txt merge=union diff --git a/test/.gitattributes b/test/.gitattributes deleted file mode 100644 index 1b6e6a1a425..00000000000 --- a/test/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -test_owners.csv merge=union