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

though the checkin message failed to note that).

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;