| commit | 6e7196fb933f24abc915e9c20b9fa676a04b82c5 | [log] [tgz] |
|---|---|---|
| author | Georg Brandl <georg@python.org> | Fri Jul 04 15:45:10 2008 +0000 |
| committer | Georg Brandl <georg@python.org> | Fri Jul 04 15:45:10 2008 +0000 |
| tree | 331694aa3b2511580e1a70abcd5fd504d99f877a | |
| parent | e7c78b26c63728c0ebe081e2b9a1d9c543d2cc1d [diff] |
Fix committed merge conflict.