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

[Andreas Jung]

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

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


=== Zope/doc/CHANGES.txt 1.335.2.45 => 1.335.2.46 ===
           "real" Python package.
 
+        - Fixed conflict resolution problem in BTrees (BTreeTemplace/
+          _p_resolveConflict)
+
+        - Fixed conflict resolution problem in BTrees (BTreeTemplace/
+          _p_resolveConflict)
+
 
     Zope 2.4.0