From 878b4bfca2f1bba7620b156745adafb774f0366f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 22 May 2017 18:43:05 -0400 Subject: [PATCH] - remove .gitattributes and merge=union as this isn't really working anyway. need to try something else. Change-Id: I7a1a298023e151f04502c268734961b86ed2519b --- .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.47.2