diff options
| author | Georg Brandl <georg@python.org> | 2008-07-04 15:45:10 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-07-04 15:45:10 (GMT) |
| commit | 6e7196fb933f24abc915e9c20b9fa676a04b82c5 (patch) | |
| tree | 331694aa3b2511580e1a70abcd5fd504d99f877a /Lib/test/test_unicode.py | |
| parent | e7c78b26c63728c0ebe081e2b9a1d9c543d2cc1d (diff) | |
| download | cpython-6e7196fb933f24abc915e9c20b9fa676a04b82c5.zip cpython-6e7196fb933f24abc915e9c20b9fa676a04b82c5.tar.gz cpython-6e7196fb933f24abc915e9c20b9fa676a04b82c5.tar.bz2 | |
Fix committed merge conflict.
Diffstat (limited to 'Lib/test/test_unicode.py')
0 files changed, 0 insertions, 0 deletions