mirror of
https://github.com/python/cpython.git
synced 2026-06-03 18:19:13 -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>.