Author: Matti Picus <matti.pi...@gmail.com>
Branch: release-pypy2.7-7.x
Changeset: r95827:bb774cc5b3f4
Date: 2019-02-05 14:39 +0100
http://bitbucket.org/pypy/pypy/changeset/bb774cc5b3f4/
Log: fix merge (antocuni)
diff --git a/pypy/module/cpyext/include/patchlevel.h
b/pypy/module/cpyext/include/patchlevel.h
--- a/pypy/module/cpyext/include/patchlevel.h
+++ b/pypy/module/cpyext/include/patchlevel.h
@@ -32,14 +32,9 @@
* module/sys/version.py
* doc/conf.py
*/
-<<<<<<< working copy
#define PYPY_VERSION "7.0.0"
#define PYPY_VERSION_NUM 0x07000000
-=======
-#define PYPY_VERSION "7.1.0-alpha0"
-#define PYPY_VERSION_NUM 0x07010000
->>>>>>> merge rev
/* Defined to mean a PyPy where cpyext holds more regular references
to PyObjects, e.g. staying alive as long as the internal PyPy object
stays alive. */
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
