summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2014-12-01 23:15:26 (GMT)
committerBarry Warsaw <barry@python.org>2014-12-01 23:15:26 (GMT)
commit9d98c9bf42412e05b5352329c6f141df49dd8df7 (patch)
tree74057c6e1f466ccc3c3bccb0c3bbf9f2ad05a8c5 /Objects
parent9e4db75426be7433af7c0d5b569fb3f3c4b5877e (diff)
downloadcpython-9d98c9bf42412e05b5352329c6f141df49dd8df7.zip
cpython-9d98c9bf42412e05b5352329c6f141df49dd8df7.tar.gz
cpython-9d98c9bf42412e05b5352329c6f141df49dd8df7.tar.bz2
Make this change a little more robust for up-merging.
Diffstat (limited to 'Objects')
0 files changed, 0 insertions, 0 deletions