diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-09 10:14:32 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-09 10:14:32 -0400 |
| commit | acce77b1dfb768dd7fdec3b76dc5c64d27320f82 (patch) | |
| tree | 7974fddd9edd07e2bcf7004cc48d668d4d9a6083 /docs/conf.py | |
| parent | 87db22d06a93278635e4fc551872be3b40c5a249 (diff) | |
| download | python-setuptools-git-acce77b1dfb768dd7fdec3b76dc5c64d27320f82.tar.gz | |
Moved MERGE.txt into the setuptools documentation.
--HG--
rename : MERGE.txt => docs/merge.txt
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions