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

[Casey Duncan]

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

Modified Files:
	PropertyManager.py 
Log Message:
Revert change that broke property sheets containing integers


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