| Chunk |
|---|
| Conflicting content |
|---|
build.setResult(Result.FAILURE);
return true;
}
<<<<<<< HEAD
=======
File dir = build.getArtifactsDir();
dir.mkdirs();
>>>>>>> 2454c06d045cf99f9ac3819bb75d6f22f8e0d272
listener.getLogger().println(Messages.ArtifactArchiver_ARCHIVING_ARTIFACTS());
try { |
| Solution content |
|---|
build.setResult(Result.FAILURE);
return true;
}
listener.getLogger().println(Messages.ArtifactArchiver_ARCHIVING_ARTIFACTS());
try { |
| File |
|---|
| ArtifactArchiver.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |