summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-03-31 17:19:40 (GMT)
committerGuido van Rossum <guido@python.org>1997-03-31 17:19:40 (GMT)
commit94dbd9948351d8f1ed09799eae622242b15d4cc1 (patch)
treeb5e31b28fb55dc841b2b51b5bc239a251061c5e8 /Include
parent9199f62aa1153d9c13ed97a94185a80666125303 (diff)
downloadcpython-94dbd9948351d8f1ed09799eae622242b15d4cc1.zip
cpython-94dbd9948351d8f1ed09799eae622242b15d4cc1.tar.gz
cpython-94dbd9948351d8f1ed09799eae622242b15d4cc1.tar.bz2
Remove ConflictError (which was also removed from bltinmodule.c, even
though the checkin message failed to note that).
Diffstat (limited to 'Include')
-rw-r--r--Include/pyerrors.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 61751e6..bdc17ee 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -49,7 +49,6 @@ void PyErr_Restore Py_PROTO((PyObject *, PyObject *, PyObject *));
extern DL_IMPORT(PyObject *) PyExc_AccessError;
extern DL_IMPORT(PyObject *) PyExc_AttributeError;
-extern DL_IMPORT(PyObject *) PyExc_ConflictError;
extern DL_IMPORT(PyObject *) PyExc_EOFError;
extern DL_IMPORT(PyObject *) PyExc_FloatingPointError;
extern DL_IMPORT(PyObject *) PyExc_IOError;