[pypy-commit] pypy pythoninspect-fix: argh

[squeaky]

Author: Paweł Piotr Przeradowski <przeradowski at gmail.com>
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