From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 4 Nov 2013 14:24:05 +0000 (+1000)
Subject: Remove merge artifact from Misc/NEWS
X-Git-Tag: v2.7.8~294
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=768e8475b1195ded8011d952be284a944cf5afbc;p=python

Remove merge artifact from Misc/NEWS
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 98efc56027..07d1ea418f 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