From 9199f62aa1153d9c13ed97a94185a80666125303 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 31 Mar 1997 17:19:05 +0000
Subject: remove ConflictError

---
 Modules/python.exp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Modules/python.exp b/Modules/python.exp
index bb3b604..dc15522 100644
--- a/Modules/python.exp
+++ b/Modules/python.exp
@@ -107,7 +107,6 @@ PyEval_RestoreThread
 PyEval_SaveThread
 PyExc_AccessError
 PyExc_AttributeError
-PyExc_ConflictError
 PyExc_EOFError
 PyExc_IOError
 PyExc_ImportError
-- 
cgit v0.12