Remove ConflictError (which was also removed from bltinmodule.c, even

though the checkin message failed to note that).

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 61751e6273237256c82b6b18fa9b4628c95ebfe3..bdc17eee967edacfc7d3e54d6c21b245f79c7929 100644 (file)
--- 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;