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

[Matti Picus]

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


Commits:
3db31300 by Matti Picus at 2020-07-16T01:09:46+03:00
fix another merge problem

--HG--
branch : py3.7

- - - - -


1 changed file:

- pypy/interpreter/unicodehelper.py


View it on GitLab: https://foss.heptapod.net/pypy/pypy/-/commit/3db3130045c9a262f3bdd7e416f98202d36b1f0b

-- 
View it on GitLab: https://foss.heptapod.net/pypy/pypy/-/commit/3db3130045c9a262f3bdd7e416f98202d36b1f0b
You're receiving this email because of your account on foss.heptapod.net.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/pypy-commit/attachments/20200715/8a8031bd/attachment.html>