diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-22 18:42:17 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-22 18:42:17 -0400 |
| commit | 024e8b107e6a971d7ba6817ad2a1b474b598094a (patch) | |
| tree | 974e3ef1aeedc6b57d7c1131f6a31179703bc860 | |
| parent | 42b6ef8ccd691f6ace30ae16ed70f92e748f763f (diff) | |
| download | sqlalchemy-024e8b107e6a971d7ba6817ad2a1b474b598094a.tar.gz | |
- remove .gitattributes and merge=union as this isn't really
working anyway. need to try something else.
Change-Id: Iabcefa4b66d242acb74a8135c2f5a6a4345441a7
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index ffa4fc4c0..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -doc/build/changelog/*.rst merge=union |