From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 21 Mar 2009 10:51:42 +0000 (+0000)
Subject: Remove remnants of svn conflict marker from Misc/NEWS
X-Git-Tag: v3.1a2~241
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af23217798749787b32e8b961126ecc14b888e52;p=thirdparty%2FPython%2Fcpython.git

Remove remnants of svn conflict marker from Misc/NEWS
---

diff --git a/Misc/NEWS b/Misc/NEWS
index bad0a4447463..0d3137fa3b99 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,7 +60,6 @@ What's New in Python 3.1 alpha 1
 Core and Builtins
 -----------------
 
-=======
 - The io module has been reimplemented in C for speed.
 
 - Give dict views an informative __repr__.