diff options
author | Steve Dower <steve.dower@microsoft.com> | 2016-11-15 00:16:44 (GMT) |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2016-11-15 00:16:44 (GMT) |
commit | 7ed2398448edf3298f70a7c6ee28b1d75a462f37 (patch) | |
tree | 32c5678495913c6049da805dcf1a5a4fd7d5ea28 /Tools/pynche/html40colors.txt | |
parent | e044dfa22b4d4cef982fbf01f8f8f6d971381148 (diff) | |
download | cpython-7ed2398448edf3298f70a7c6ee28b1d75a462f37.zip cpython-7ed2398448edf3298f70a7c6ee28b1d75a462f37.tar.gz cpython-7ed2398448edf3298f70a7c6ee28b1d75a462f37.tar.bz2 |
Fixes incorrect merge
Diffstat (limited to 'Tools/pynche/html40colors.txt')
0 files changed, 0 insertions, 0 deletions