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

pospispa · Nov 2, 2016 · 955f313 · 955f313
1 parent 9980291
commit 955f313
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.gitattributes 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
diff --git a/test/.gitattributes b/test/.gitattributes
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		hack/verify-flags/known-flags.txt merge=union
		test/test_owners.csv merge=union