| Chunk |
|---|
| Conflicting content |
|---|
builder.append(handleField(field, clazz));
}
builder.append("return elements; } ");
<<<<<<< HEAD
try {
m.setBody(builder.toString());
} catch (Exception e) {
e.printStackTrace();
System.err.println(builder.toString());
}
=======
m.setBody(builder.toString());
>>>>>>> 7ac244e1f3ff0b368b7363d1cff40ed6b53a2a30
clazz.addMethod(m);
}
|
| Solution content |
|---|
builder.append(handleField(field, clazz));
}
builder.append("return elements; } ");
m.setBody(builder.toString());
clazz.addMethod(m);
}
|
| File |
|---|
| ManipulationUtils.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Try statement |