Fix other merge conflict, automatically find the JAVA_HOME

2021-03-19 19:14:24 -04:00
parent 8045d2e484
commit 0110bd956b
2 changed files with 10 additions and 7 deletions
--- a/java/net/i2p/router/PackageLauncher.java
+++ b/java/net/i2p/router/PackageLauncher.java
@ -78,14 +78,9 @@ public class PackageLauncher {
            targetDir.mkdirs();
        else if (!targetDir.isDirectory())
            throw new Exception(targetDir + " exists but not a directory.  Please get it out of the way");
-<<<<<<< HEAD
-	System.out.println(targetFile.toPath());
-        Files.copy(resource, targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-=======

        if (!targetFile.exists() || overwrite)
            Files.copy(resource, targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
->>>>>>> 52dbe4c90a0a27229bc391318dcd06254b6936e6
    }
 }