summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2013-11-04 14:24:05 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2013-11-04 14:24:05 (GMT)
commit768e8475b1195ded8011d952be284a944cf5afbc (patch)
tree256bc712e2f12a3c949872e32c8810e0a7ff02ea /Misc
parent6a98749e9c7b3917b01f2f47267e134ecd1c2df1 (diff)
downloadcpython-768e8475b1195ded8011d952be284a944cf5afbc.zip
cpython-768e8475b1195ded8011d952be284a944cf5afbc.tar.gz
cpython-768e8475b1195ded8011d952be284a944cf5afbc.tar.bz2
Remove merge artifact from Misc/NEWS
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS1
1 files changed, 0 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 98efc56..07d1ea4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,7 +18,6 @@ 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 #19286: Directories in ``package_data`` are no longer added to