[Python-checkins] cpython (merge 3.5 -> default): Fixed merge error.

Fri Sep 4 07:40:31 CEST 2015

https://hg.python.org/cpython/rev/b201e3e044b6
changeset: 97654:b201e3e044b6
parent: 97652:bd165adf086a
parent: 97653:cb28ffefd730
user: Serhiy Storchaka <storchaka at gmail.com>
date: Fri Sep 04 08:39:33 2015 +0300
summary:
 Fixed merge error.
files:
 Misc/NEWS | 6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -166,12 +166,6 @@
 Library
 -------
 
-- Issue #24913: Fix overrun error in deque.index().
- Found by John Leitch and Bryce Darling.
-
-- Issue #24913: Fix overrun error in deque.index().
- Found by John Leitch and Bryce Darling.
-
 - Issue #24989: Fixed buffer overread in BytesIO.readline() if a position is
 set beyond size. Based on patch by John Leitch.
 
-- 
Repository URL: https://hg.python.org/cpython
