Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql	15 Dec 2003 11:21:04 -0000	1.15
+++ openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql	18 Jan 2004 14:18:09 -0000	1.16
@@ -559,14 +559,9 @@
         where cr_items.item_id = new_version__item_id;
 
         perform acs_object__update_last_modified(v_folder_id,new_version__creation_user,new_version__creation_ip);
-<<<<<<< file-storage-package-create.sql
-	perform acs_object__update_last_modified(new_version__item_id,new_version__creation_user,new_version__creation_ip);
-	return v_revision_id;
-=======
-	perform acs_object__update_last_modified(new_version__item_id,new_version__creation_user,new_version__creation_ip);
+    	perform acs_object__update_last_modified(new_version__item_id,new_version__creation_user,new_version__creation_ip);
 
         return v_revision_id;
->>>>>>> 1.13
 
 end;' language 'plpgsql';