From: Guido van Rossum <guido@python.org>
Date: Mon, 31 Mar 1997 17:19:40 +0000 (+0000)
Subject: Remove ConflictError (which was also removed from bltinmodule.c, even
X-Git-Tag: v1.5a1~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94dbd9948351d8f1ed09799eae622242b15d4cc1;p=python

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 61751e6273..bdc17eee96 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;