[Zope-Checkins] CVS: Zope/lib/python/OFS - Application.py:1.179

[Andreas Jung]

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

Modified Files:
	Application.py 
Log Message:
fixed broken commit


=== Zope/lib/python/OFS/Application.py 1.178 => 1.179 ===
     if not hasattr(app, 'Examples') and not \
        hasattr(app, '_Zope25_examples_have_been_added'):
-<<<<<<< Application.py
-        examples_path = os.path.join(Globals.INSTANCE_HOME, 'import', 'Examples.zexp')
-=======
 
         examples_path = os.path.join(Globals.SOFTWARE_HOME, \
              '..','..','import', 'Examples.zexp')
->>>>>>> 1.176.2.2
+
         if os.path.isfile(examples_path):
             app._importObjectFromFile(examples_path, verify=0)
             app._Zope25_examples_have_been_added=1