Removed cvs conflict text that was so helpfully added for me on the last commit

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

Showing with 1 addition and 5 deletions

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

No files found.
--- a/lib/python/OFS/PropertyManager.py
+++ b/lib/python/OFS/PropertyManager.py
@@ -12,11 +12,7 @@
 ##############################################################################

 """Property management"""
-<<<<<<< PropertyManager.py
-__version__='$Revision: 1.49 $'[11:-2]
-=======
-__version__='$Revision: 1.49 $'[11:-2]
->>>>>>> 1.46.6.1
+__version__='$Revision: 1.50 $'[11:-2]

 import ExtensionClass, Globals
 import ZDOM