--- MPIWGWeb/MPIWGProjects.py	2009/02/18 15:42:00	1.47.2.109
+++ MPIWGWeb/MPIWGProjects.py	2009/12/15 13:16:47	1.47.2.111
@@ -130,7 +130,9 @@ class MPIWGProject_image(Image):
 
 class MPIWGProject(CatalogAware,Folder,Cacheable):
     """Class for Projects"""
-
+    
+    def _p_resolveConflict(self, oldState, savedState, newState):
+	return newState
 
     security=ClassSecurityInfo()
     meta_type='MPIWGProject'
@@ -529,7 +531,11 @@ class MPIWGProject(CatalogAware,Folder,C
     def setArchiveTime(self,time):
         """set Archive Time"""
         self.archiveTime=time[0:]
-        
+    	
+    def delArchiveTime(self):
+	"""delete archive time"""
+	del self.archiveTime
+
     def versionManageForm(self):
         """version Manage form:currently only set to invisible"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_versionManageForm.zpt')).__of__(self)