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

[Matti Picus]

Matti Picus pushed to branch branch/win64-py3.7 at PyPy / pypy


Commits:
4f276990 by Matti Picus at 2020-11-29T21:11:44+02:00
fix merge

--HG--
branch : win64-py3.7

- - - - -


2 changed files:

- pypy/module/_hpy_universal/llapi.py
- pypy/module/cpyext/typeobject.py


View it on GitLab: https://foss.heptapod.net/pypy/pypy/-/commit/4f2769903512f0360138e40a927a1704e3b5450b

-- 
View it on Heptapod: https://foss.heptapod.net/pypy/pypy/-/commit/4f2769903512f0360138e40a927a1704e3b5450b
You're receiving this email because of your account on foss.heptapod.net.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.python.org/pipermail/pypy-commit/attachments/20201129/96669b96/attachment.html>