| Chunk |
|---|
| Conflicting content |
|---|
id.setInnerText(proxy.getId() == null ? "" : String.valueOf(proxy.getId()));
version.setInnerText(proxy.getVersion() == null ? "" : String.valueOf(proxy.getVersion()));
title.setInnerText(proxy.getTitle() == null ? "" : String.valueOf(proxy.getTitle()));
<<<<<<< HEAD
displayRenderer.setInnerText(ch.unibas.medizin.osce.client.managed.ui.CheckListProxyRenderer.instance().render(proxy));
=======
checkListTopics.setInnerText(proxy.getCheckListTopics() == null ? "" : ch.unibas.medizin.osce.client.scaffold.place.CollectionRenderer.of(ch.unibas.medizin.osce.client.managed.ui.ChecklistTopicProxyRenderer.instance()).render(proxy.getCheckListTopics()));
displayRenderer.setInnerText(CheckListProxyRenderer.instance().render(proxy));
>>>>>>> 7bfe8b797263ee998bab44583728ee3ff6fc7a53
}
} |
| Solution content |
|---|
id.setInnerText(proxy.getId() == null ? "" : String.valueOf(proxy.getId()));
version.setInnerText(proxy.getVersion() == null ? "" : String.valueOf(proxy.getVersion()));
title.setInnerText(proxy.getTitle() == null ? "" : String.valueOf(proxy.getTitle()));
checkListTopics.setInnerText(proxy.getCheckListTopics() == null ? "" : ch.unibas.medizin.osce.client.scaffold.place.CollectionRenderer.of(ch.unibas.medizin.osce.client.managed.ui.ChecklistTopicProxyRenderer.instance()).render(proxy.getCheckListTopics()));
}
} |
| File |
|---|
| CheckListDetailsView_Roo_Gwt.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method invocation |