]> granicus.if.org Git - python/commit
forgot to resolve this conflict...
authorBenjamin Peterson <benjamin@python.org>
Wed, 25 Jan 2012 21:43:26 +0000 (16:43 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 25 Jan 2012 21:43:26 +0000 (16:43 -0500)
commitdcd37e81542418546255cdd451d0e5326d7dba35
tree832ac223577dd986653f737e0d6320be249985bd
parentaf90a4044571242c81e2f42a1f3c5b277afa9d47
forgot to resolve this conflict...
Doc/library/stdtypes.rst