mirror of
https://github.com/python/cpython.git
synced 2026-05-08 21:50:40 -04:00
63eb6300a9
different browsers resolve the conflicts differently, and the "proper" resolution is not what we actually want. Reported by Peter Funk <pf@artcom-gmbh.de>.