summaryrefslogtreecommitdiff
path: root/Python/errors.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-05-04 23:22:13 +0000
committerBenjamin Peterson <benjamin@python.org>2008-05-04 23:22:13 +0000
commit9f4bf1dcd141aac75ca0ae32d97c45248d685866 (patch)
tree9bb090f75e156ed3e47efbbd6718500122278c36 /Python/errors.c
parent81ee3efededdaba0a7c0b1a3aac07727cebb6fc1 (diff)
downloadcpython-git-9f4bf1dcd141aac75ca0ae32d97c45248d685866.tar.gz
Fix merge error
Diffstat (limited to 'Python/errors.c')
0 files changed, 0 insertions, 0 deletions