[Zope-Checkins] CVS: Zope/lib/python/OFS - PropertyManager.py:1.50

[Casey Duncan]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv4190

Modified Files:
	PropertyManager.py 
Log Message:
Removed cvs conflict text that was so helpfully added for me on the last commit


=== Zope/lib/python/OFS/PropertyManager.py 1.49 => 1.50 ===
--- Zope/lib/python/OFS/PropertyManager.py:1.49	Fri Sep 13 15:41:04 2002
+++ Zope/lib/python/OFS/PropertyManager.py	Fri Sep 13 16:19:34 2002
@@ -12,11 +12,7 @@
 ##############################################################################
 
 """Property management"""
-<<<<<<< PropertyManager.py
 __version__='$Revision$'[11:-2]
-=======
-__version__='$Revision$'[11:-2]
->>>>>>> 1.46.6.1
 
 import ExtensionClass, Globals
 import ZDOM