summaryrefslogtreecommitdiffstats
path: root/Python/dynload_os2.c
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2013-01-27 02:08:22 (GMT)
committerNed Deily <nad@acm.org>2013-01-27 02:08:22 (GMT)
commit4511e276d57f2ff1a902e3f5ef8a24103292e7db (patch)
tree509a9ea9ce4180419b57e0f7d72dc6d2cce605ba /Python/dynload_os2.c
parentc19d7b6556b6b0a8e2ad84fab99feeff4fb4f7de (diff)
downloadcpython-4511e276d57f2ff1a902e3f5ef8a24103292e7db.zip
cpython-4511e276d57f2ff1a902e3f5ef8a24103292e7db.tar.gz
cpython-4511e276d57f2ff1a902e3f5ef8a24103292e7db.tar.bz2
Issue #14018: fix merge error
Diffstat (limited to 'Python/dynload_os2.c')
0 files changed, 0 insertions, 0 deletions