summaryrefslogtreecommitdiff
path: root/Lib/test/test_pydoc.py
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2013-01-26 18:09:12 -0800
committerNed Deily <nad@acm.org>2013-01-26 18:09:12 -0800
commit8916b853b9331f2ad51df4fcfd5d3fc528c1e195 (patch)
treed55c709c167dab935f5332229da6cee012245bf0 /Lib/test/test_pydoc.py
parent059972535fcefc524da52f057c6de22d10646655 (diff)
downloadcpython-git-8916b853b9331f2ad51df4fcfd5d3fc528c1e195.tar.gz
Issue #14018: fix merge error
Diffstat (limited to 'Lib/test/test_pydoc.py')
0 files changed, 0 insertions, 0 deletions