resolve merge conflict
This commit is contained in:
@ -64,6 +64,7 @@ public class PackageLauncher {
|
||||
String []split = description.split(",");
|
||||
String url = split[0];
|
||||
String target = split[1];
|
||||
boolean overwrite = Boolean.parseBoolean(split[2]);
|
||||
|
||||
var resource = PackageLauncher.class.getClassLoader().getResourceAsStream(url);
|
||||
|
||||
@ -77,8 +78,14 @@ 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
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user