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

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

Change-Id: Iabcefa4b66d242acb74a8135c2f5a6a4345441a7
---

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