summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-09-04 08:39:33 +0300
committerSerhiy Storchaka <storchaka@gmail.com>2015-09-04 08:39:33 +0300
commitf69104f15a49439170f91bdd86d6a19cdb26348a (patch)
tree3a2a13481251ea7d5a50a4475267aea7d69eedb7 /Python
parente1a4c57663baa16be8bb682c1b890a84087cd21f (diff)
parent6e87576571b5d2decc7d3e554d1c3ce31e455145 (diff)
downloadcpython-git-f69104f15a49439170f91bdd86d6a19cdb26348a.tar.gz
Fixed merge error.
Diffstat (limited to 'Python')
0 files changed, 0 insertions, 0 deletions