]> granicus.if.org Git - python/commit
Fixed merging error in 3ebeeed1eb28.
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 6 Nov 2015 09:21:02 +0000 (11:21 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 6 Nov 2015 09:21:02 +0000 (11:21 +0200)
commit501c16d1df46555dccf35d8ed6f72bac9c72d444
tree3680d38c3666fd8387776c35020f46b9d3bdc945
parent3a811f272af4df08044a9500c6350a5eb8bb2fe9
parent4981dd2cb8cda13ea9f8ec1e79c6be0b31be30e6
Fixed merging error in 3ebeeed1eb28.
Thanks Марк Коренберг.