[Zope-Checkins] CVS: Zope/doc - CHANGES.txt:1.335.2.70

[Chris McDonough]

Update of /cvs-repository/Zope/doc
In directory cvs.zope.org:/tmp/cvs-serv3116

Modified Files:
      Tag: Zope-2_4-branch
	CHANGES.txt 
Log Message:



=== Zope/doc/CHANGES.txt 1.335.2.69 => 1.335.2.70 ===
           Steve Alexander)
 
+        - Fixed bug in ZODB conflict resolution code where attempts to
+          resolve conflicts in ZClasses generated inapprorpriate errors.
+         (ChrisM, thanks to Lance Carito for finding).
+
     Zope 2.4.1
 
       Bugs fixed