| commit | ebd9af44c53dd17dd8f6f2a60697ed6ee885e1d5 | [log] [tgz] |
|---|---|---|
| author | Georg Brandl <georg@python.org> | Fri Aug 01 16:25:12 2008 +0000 |
| committer | Georg Brandl <georg@python.org> | Fri Aug 01 16:25:12 2008 +0000 |
| tree | ae17553d45f2a28f01f5db4a647b441bc6bf9d24 | |
| parent | 33df74ae129ff56fb07e2a7283652640624ee8c1 [diff] |
Fix merge conflict.