Author: Paweł Piotr Przeradowski <[email protected]> Branch: pythoninspect-fix Changeset: r65672:e026c95e2f05 Date: 2013-07-25 22:25 +0200 http://bitbucket.org/pypy/pypy/changeset/e026c95e2f05/
Log: argh diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head.rst @@ -43,4 +43,3 @@ .. branch: statvfs_tests Added some addition tests for statvfs. ->>>>>>> other _______________________________________________ pypy-commit mailing list [email protected] http://mail.python.org/mailman/listinfo/pypy-commit
