[Python-checkins] r77684 - python/branches/release26-maint/Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Fri Jan 22 12:20:00 2010
New Revision: 77684

Log:
Remove line left over from merging.

Modified:
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Fri Jan 22 12:20:00 2010
@@ -177,9 +177,6 @@
 
 Build
 -----
->>>>>>> .merge-right.r77680
-Build
------
 
 - Issue #7661: Allow ctypes to be built from a non-ASCII directory path.
   Patch by Florent Xicluna.