[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/file/DEPENDENCIES.cfg removed merge conflict

[Andreas Jung]

Log message for revision 40973:
  removed merge conflict
  

Changed:
  U   Zope3/trunk/src/zope/app/file/DEPENDENCIES.cfg

-=-
Modified: Zope3/trunk/src/zope/app/file/DEPENDENCIES.cfg
===================================================================
--- Zope3/trunk/src/zope/app/file/DEPENDENCIES.cfg	2005-12-22 07:03:22 UTC (rev 40972)
+++ Zope3/trunk/src/zope/app/file/DEPENDENCIES.cfg	2005-12-22 08:51:39 UTC (rev 40973)
@@ -1,11 +1,7 @@
 persistent
 transaction
 zope.app
-<<<<<<< .mine
-zope.app.content_types
-=======
 zope.app.contenttypes
->>>>>>> .r40835
 zope.app.onlinehelp
 zope.interface
 zope.publisher