From 024e8b107e6a971d7ba6817ad2a1b474b598094a Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 22 May 2017 18:42:17 -0400 Subject: [PATCH] - remove .gitattributes and merge=union as this isn't really working anyway. need to try something else. Change-Id: Iabcefa4b66d242acb74a8135c2f5a6a4345441a7 --- .gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index ffa4fc4c0e..0000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -doc/build/changelog/*.rst merge=union -- 2.39.5