diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2015-10-21 13:38:36 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2015-10-21 13:38:36 (GMT) |
| commit | 4da71055e1aca0b9a047b5a3405cedf3c4c661f6 (patch) | |
| tree | c4d11e8dac22d8cfdb782c676cf5accb8f753dd3 /Lib/pydoc.py | |
| parent | 9aba8c8a9552ae74b30b261b2eaa9a5720a2c27f (diff) | |
| download | cpython-4da71055e1aca0b9a047b5a3405cedf3c4c661f6.zip cpython-4da71055e1aca0b9a047b5a3405cedf3c4c661f6.tar.gz cpython-4da71055e1aca0b9a047b5a3405cedf3c4c661f6.tar.bz2 | |
Fix merge conflict artifacts and move the entry to correct place
Diffstat (limited to 'Lib/pydoc.py')
0 files changed, 0 insertions, 0 deletions