Revert change that broke property sheets containing integers

0cfd43cc · Casey Duncan · 19a66eb0 · 0cfd43cc
Commit 0cfd43cc authored Sep 13, 2002 by Casey Duncan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lib/python/OFS/PropertyManager.py lib/python/OFS/PropertyManager.py +5 -1

No files found.
--- a/lib/python/OFS/PropertyManager.py
+++ b/lib/python/OFS/PropertyManager.py
@@ -12,7 +12,11 @@
 ##############################################################################
 """Property management"""
-__version__='$Revision: 1.48 $'[11:-2]
+<<<<<<< PropertyManager.py
+__version__='$Revision: 1.49 $'[11:-2]
+=======
+__version__='$Revision: 1.49 $'[11:-2]
+>>>>>>> 1.46.6.1
 import ExtensionClass, Globals
 import ZDOM