diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-06-14 02:23:31 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-14 02:23:31 +0000 |
| commit | b76916463689d2cdcf468f7f1dd7b10dbee09bc8 (patch) | |
| tree | ff379f1891c1539f2e60e3a5da23858d37377a18 /Lib/idlelib/configDialog.py | |
| parent | e371599004698934701ccf512f3cfdbde1cb5fa2 (diff) | |
| download | cpython-git-b76916463689d2cdcf468f7f1dd7b10dbee09bc8.tar.gz | |
Issue #17500: Remove merge conflict scar tissue
Diffstat (limited to 'Lib/idlelib/configDialog.py')
0 files changed, 0 insertions, 0 deletions