Commit 24772393 authored by Mark Dickinson's avatar Mark Dickinson

Remove remnants of svn conflict marker from Misc/NEWS

parent d3cba289
...@@ -60,7 +60,6 @@ What's New in Python 3.1 alpha 1 ...@@ -60,7 +60,6 @@ What's New in Python 3.1 alpha 1
Core and Builtins Core and Builtins
----------------- -----------------
=======
- The io module has been reimplemented in C for speed. - The io module has been reimplemented in C for speed.
- Give dict views an informative __repr__. - Give dict views an informative __repr__.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment