hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
kstamatis
2013-10-18 21:48:18 +03:00
parent 8445c1a7af
commit 566bb592ef
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
View File

@@ -1930,7 +1930,6 @@ public class ItemImport
boolean pathDeleted = path.delete(); boolean pathDeleted = path.delete();
return (pathDeleted); return (pathDeleted);
} }
<<<<<<< HEAD
/** /**
* Generate a random filename based on current time * Generate a random filename based on current time
@@ -2120,6 +2119,3 @@ public class ItemImport
} }
} }
} }
=======
}
>>>>>>> DS-1686