[Zope-Checkins] CVS: Zope2 - FileStorage.py:1.49.8.1.6.1

Jim Fulton jim@digiciool.com
Wed, 28 Feb 2001 19:57:15 -0500 (EST) 

Update of /cvs-repository/Zope2/lib/python/ZODB
In directory korak:/tmp/cvs-serv28228

Modified Files:
      Tag: Catalog-BTrees-Integration
	FileStorage.py 
Log Message:
Added a new protocol, _p_resolveConflict, for application-level
conflict resolution.