]> granicus.if.org Git - python/commitdiff
Remove line left over from merging.
authorGeorg Brandl <georg@python.org>
Fri, 22 Jan 2010 11:20:00 +0000 (11:20 +0000)
committerGeorg Brandl <georg@python.org>
Fri, 22 Jan 2010 11:20:00 +0000 (11:20 +0000)
Misc/NEWS

index 2275be26cf8ef12543806b6e1165d045b00f2def..530e6a72d44bdec7baff29175c844232b927ab24 100644 (file)
--- 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.