commit 94dbd9948351d8f1ed09799eae622242b15d4cc1
author Guido van Rossum <guido@python.org> Mon Mar 31 17:19:40 1997 +0000
committer Guido van Rossum <guido@python.org> Mon Mar 31 17:19:40 1997 +0000
tree b5e31b28fb55dc841b2b51b5bc239a251061c5e8
parent 9199f62aa1153d9c13ed97a94185a80666125303

Remove ConflictError (which was also removed from bltinmodule.c, even
though the checkin message failed to note that).

Include/pyerrors.h

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 @@
 
 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;