From: Georg Brandl <georg@python.org>
Date: Fri, 22 Jan 2010 11:20:00 +0000 (+0000)
Subject: Remove line left over from merging.
X-Git-Tag: v2.6.5rc1~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfa0474685696fe207fa10ab73469d409f223b6f;p=python

Remove line left over from merging.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 2275be26cf..530e6a72d4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -177,9 +177,6 @@ Extension Modules
 
 Build
 -----
->>>>>>> .merge-right.r77680
-Build
------
 
 - Issue #7661: Allow ctypes to be built from a non-ASCII directory path.
   Patch by Florent Xicluna.