[pypy-commit] [Git][pypy/pypy][branch/py3.6] fix merge

2020-08-30 Thread Matti Picus
Matti Picus pushed to branch branch/py3.6 at PyPy / pypy Commits: d4b9fe6f by Matti Picus at 2020-08-30T16:30:05+03:00 fix merge --HG-- branch : py3.6 - - - - - 1 changed file: - pypy/module/_cffi_backend/test/test_c.py View it on GitLab: https://foss.heptapod.net/pypy/pypy/-/commit/d4b

[pypy-commit] [Git][pypy/pypy][branch/py3.6] fix merge

2020-03-07 Thread Ronan Lamy
Ronan Lamy pushed to branch branch/py3.6 at PyPy / pypy Commits: bd68230b by Ronan Lamy at 2020-03-07T13:31:27+01:00 fix merge --HG-- branch : py3.6 - - - - - 1 changed file: - pypy/module/cpyext/api.py View it on GitLab: https://foss.heptapod.net/pypy/pypy/commit/bd68230b396ae4efe0618472