8000 Fix merge conflicts. · python/cpython@218e724 · GitHub

Commit 218e724

committed

Fix merge conflicts.

1 parent 375f9d4 commit 218e724Copy full SHA for 218e724

2 files changed

+311

-148

lines changed

Modules/clinic
- _ssl.c.h
Tools/clinic/libclinic
- parse_args.py

2 files changed

+311

-148

lines changed

Comments

(0)

0