summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-22 11:20:00 (GMT)
committerGeorg Brandl <georg@python.org>2010-01-22 11:20:00 (GMT)
commitcfa0474685696fe207fa10ab73469d409f223b6f (patch)
tree9d3b7866afe03e2fefbaaa68c75a4eacdfa88dab /Misc
parent690d13ab553f4921d44e419ccf939cccc939690a (diff)
downloadcpython-cfa0474685696fe207fa10ab73469d409f223b6f.zip
cpython-cfa0474685696fe207fa10ab73469d409f223b6f.tar.gz
cpython-cfa0474685696fe207fa10ab73469d409f223b6f.tar.bz2
Remove line left over from merging.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 0 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2275be2..530e6a7 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.