Fix conflict

2025-10-16 14:33:09 +00:00 · 2013-10-18 21:48:18 +03:00
parent 8445c1a7af
commit 566bb592ef
1 changed files with 0 additions and 4 deletions
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
@@ -1930,7 +1930,6 @@ public class ItemImport
        boolean pathDeleted = path.delete();
        return (pathDeleted);
    }
-<<<<<<< HEAD
    
    /**
     * Generate a random filename based on current time
@@ -2120,6 +2119,3 @@ public class ItemImport
        }
    }
 }
-=======
-}
->>>>>>> DS-1686