| Chunk |
|---|
| Conflicting content |
|---|
addJvmArgs(jvmArgs);
addArgs(args);
}
<<<<<<< HEAD
=======
public void addJvmArgs(String... args) {
if(args != null) {
for(String arg : args) {
this.jvmArgs.add(arg);
}
}
}
public void addOption(String key, String value) {
if ((value == null) || (key == null)) {
return;
}
addArgs(key, value);
}
>>>>>>> e197c9e13d3ff101b5e4eb132d084d00e389ba9d
public void addOption(String key, String value) { |
| Solution content |
|---|
addJvmArgs(jvmArgs);
addArgs(args);
}
public void addJvmArgs(String... args) {
if(args != null) {
for(String arg : args) {
this.jvmArgs.add(arg);
}
}
}
public void addOption(String key, String value) { |
| File |
|---|
| AbstractJavaMainCaller.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method declaration |