]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
projects / thirdparty / sqlalchemy / sqlalchemy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 42b6ef8)
- remove .gitattributes and merge=union as this isn't really
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 22 May 2017 22:42:17 +0000 (18:42 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 22 May 2017 22:42:17 +0000 (18:42 -0400)
working anyway.   need to try something else.

Change-Id: Iabcefa4b66d242acb74a8135c2f5a6a4345441a7

.gitattributes [deleted file] patch | blob | blame | history

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644 (file)
index ffa4fc4..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-doc/build/changelog/*.rst merge=union
Mirror of https://github.com/sqlalchemy/sqlalchemy.git