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

[Andreas Jung]

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

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


=== Zope/doc/CHANGES.txt 1.335.2.91 => 1.335.2.92 ===
           _p_resolveConflict)
 
-        - Fixed conflict resolution problem in BTrees (BTreeTemplace/
-          _p_resolveConflict)
-
         - Add 'WEBDAV_SOURCE_PORT' marker key to REQUEST.env for requests
           passing through a WebDAV source port (eases detection).