| Chunk |
|---|
| Conflicting content |
|---|
public void onMapEnd(FileInfo info) {
if (!info.isImg())
return;
<<<<<<< HEAD
mdx.addMap(info.getMapnameAsInt(), info.getHexname(),
info.getFilename());
=======
mdx.addMap(info.getMapnameAsInt());
>>>>>>> 8356604e3dc75d981482de9e6f9c84bc4435c3d2
}
public void onFinish() { |
| Solution content |
|---|
public void onMapEnd(FileInfo info) {
if (!info.isImg())
return;
mdx.addMap(info.getMapnameAsInt(), info.getHexname(),
info.getFilename());
}
public void onFinish() { |
| File |
|---|
| MdxBuilder.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |