[Python-checkins] r69093 - in python/branches/release30-maint/Doc: library/datetime.rst reference/datamodel.rst

[Brett Cannon]

On Thu, Jan 29, 2009 at 08:04, Benjamin Peterson <benjamin at python.org> wrote:
> On Wed, Jan 28, 2009 at 10:37 PM, brett. cannon
> <python-checkins at python.org> wrote:
>> Author: brett.cannon
>> Date: Thu Jan 29 05:37:06 2009
>> New Revision: 69093
>>
>> Log:
>> Backport r69092 by hand since svnmerge keeps saying there is a conflict on '.'.
>
> Just do "svn resolved ."

I was too tired after pushing the change to two other branches think
about that. =)

-Brett