diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-10-11 19:34:56 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-10-11 19:34:56 -0400 |
| commit | 75767f62ffcc886e29f2759fe56f4861ca3f8559 (patch) | |
| tree | ac8f776e6a57d2a2edba2290f6cc3e2472ff90fa /setuptools | |
| parent | f110f30df540d21c4fe7870460c07d70c6c8cd0b (diff) | |
| parent | e3e55681150f7bd389d8c3e8ce99d18e743cdb2b (diff) | |
| download | python-setuptools-git-75767f62ffcc886e29f2759fe56f4861ca3f8559.tar.gz | |
Merge VersionConflict test failure. Fixes #270.
Diffstat (limited to 'setuptools')
0 files changed, 0 insertions, 0 deletions