Update of /projects/cvsroot/python/dist/src/Include In directory monty:/usr/people/guido/python/src/Include Modified Files: pyerrors.h Log Message: Remove ConflictError (which was also removed from bltinmodule.c, even though the checkin message failed to note that). --Guido van Rossum (home page: http://www.python.org/~guido/)