Commit 098d9f3

authored

Merge pull request #1 from blaisep/pr-105670

pythonGH-106318: resolving unrelated merge conflicts

2 parents 66363b9 + 679eac8 commit 098d9f3Copy full SHA for 098d9f3

4 files changed

+347

-71

lines changed

Doc/library
- stdtypes.rst
Misc/NEWS.d/next
- Core and Builtins
  - 2022-07-07-05-37-53.gh-issue-94606.hojJ54.rst
- Library
  - 2023-10-17-16-11-03.gh-issue-52161.WBYyCJ.rst
Modules/_xxtestfuzz/fuzz_elementtree_parsewhole_corpus
- expat224_utf8_bug.xml

4 files changed

+347

-71

lines changed

Comments

(0)