summaryrefslogtreecommitdiff
path: root/conftest.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-11-16 09:40:21 -0500
committerJason R. Coombs <jaraco@jaraco.com>2014-11-16 09:40:21 -0500
commit4d4dbd3c5c69f63418ca2f22e9d6a3b8185b2e00 (patch)
tree01f6619f3630594bb677a10e4406fd822e9f6c26 /conftest.py
parentc5fa038292a9c7d6fe529c4d8001cec0d3bac9cf (diff)
parent2c33dad04fd11ebd7fc8e15d0017ff2dc617e6a3 (diff)
downloadpython-setuptools-git-4d4dbd3c5c69f63418ca2f22e9d6a3b8185b2e00.tar.gz
Merge with master
--HG-- branch : feature/issue-229
Diffstat (limited to 'conftest.py')
0 files changed, 0 insertions, 0 deletions