From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 22 May 2017 22:43:05 +0000 (-0400)
Subject: - remove .gitattributes and merge=union as this isn't really
X-Git-Tag: rel_1_1_11~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=878b4bfca2f1bba7620b156745adafb774f0366f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- remove .gitattributes and merge=union as this isn't really
    working anyway.   need to try something else.

Change-Id: I7a1a298023e151f04502c268734961b86ed2519b
---

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