Remove line left over from merging.

cfa04746 · Georg Brandl · 690d13ab · cfa04746
Commit cfa04746 authored Jan 22, 2010 by Georg Brandl
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Misc/NEWS Misc/NEWS +0 -3

No files found.
--- 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.