r13474 - Products.Archetypes/branches/1.5/Products/Archetypes

Author: davisagli
Date: Wed Feb 16 06:30:39 2011
New Revision: 13474

Modified:
   Products.Archetypes/branches/1.5/Products/Archetypes/Referenceable.py
Log:
fix merge error

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/Referenceable.py
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/Referenceable.py	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/Referenceable.py	Wed Feb 16 06:30:39 2011
@@ -10,6 +10,7 @@
 from OFS.ObjectManager import BeforeDeleteException
 
 from Products.CMFCore.utils import getToolByName
+from Products.CMFCore.permissions import View
 from OFS.CopySupport import CopySource
 from OFS.Folder import Folder
 from utils import getRelURL

------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb