From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 12 Nov 2013 04:30:47 +0000 (-0600)
Subject: Correct a merge error in Misc/NEWS
X-Git-Tag: v3.4.0b1~313^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0eac43a4eb723954cf50829fa31536cd35d1f60b;p=thirdparty%2FPython%2Fcpython.git

Correct a merge error in Misc/NEWS
---

diff --git a/Misc/NEWS b/Misc/NEWS
index d84fc4551d34..9abddbb751f2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,10 +29,10 @@ Library
 - Issue #6157: Fixed tkinter.Text.debug().  Original patch by Guilherme Polo.
 
 - Issue #6160: The bbox() method of tkinter.Spinbox now returns a tuple of
+  integers instead of a string.  Based on patch by Guilherme Polo.
 
 - Issue #10197: Rework subprocess.get[status]output to use subprocess
   functionality and thus to work on Windows. Patch by Nick Coghlan.
-  integers instead of a string.  Based on patch by Guilherme Polo.
 
 - Issue #19286: Directories in ``package_data`` are no longer added to
   the filelist, preventing failure outlined in the ticket.