| commit | 330cc52c99037eaabe0fcfa09f9b099743b0b913 | [log] [tgz] |
|---|---|---|
| author | Brett Cannon <brett@python.org> | Fri Aug 23 12:10:09 2013 -0400 |
| committer | Brett Cannon <brett@python.org> | Fri Aug 23 12:10:09 2013 -0400 |
| tree | 8a4ef3fef2469e4fa2e5f9fbdd0567571fa1f8da | |
| parent | e2f6b799b81162cdefb0f3293212f8fa47f49713 [diff] |
Delete merge markers