Author gvanrossum
Recipients Daniel.Andrade.Groppe, Mark.Shannon, berker.peksag, docs@python, gvanrossum, larry, levkivskyi, python-dev
Date 2015-09-10.17:56:18
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <CAP7+vJL73A1JEMU-tPycpUt==0n7Ng5sUVCMVzL4tnh3bxmwHg@mail.gmail.com>
In-reply-to <1441905603.4.0.932657817929.issue24272@psf.upfronthosting.co.za>
Content
I suck at merge. :-( No idea what happened. To fix it, I have now just
copied the file again from the larry branch and committed that in 3.5, then
merged up to 3.6 (default).

changeset:   97856:8a7814a3613b
branch:      3.5
parent:      97847:6c8e2c6e3a99
user:        Guido van Rossum <guido@python.org>
date:        Thu Sep 10 10:52:11 2015 -0700
summary:     Restore doc updates to typing.rst by Ivan Levkivskyi and
Daniel Andrade Groppe.

changeset:   97857:7fc4306d537b
tag:         tip
parent:      97855:d433d74e0377
parent:      97856:8a7814a3613b
user:        Guido van Rossum <guido@dropbox.com>
date:        Thu Sep 10 10:54:10 2015 -0700
summary:     Restore doc updates to typing.rst by Ivan Levkivskyi and
Daniel Andrade Groppe.
History
Date User Action Args
2015-09-10 17:56:19gvanrossumsetrecipients: + gvanrossum, larry, docs@python, Mark.Shannon, python-dev, berker.peksag, Daniel.Andrade.Groppe, levkivskyi
2015-09-10 17:56:18gvanrossumlinkissue24272 messages
2015-09-10 17:56:18gvanrossumcreate