| Chunk |
|---|
| Conflicting content |
|---|
return getFieldEntityIdChangeListenersMap();
}
<<<<<<< HEAD:mes-core/src/test/java/com/qcadoo/mes/newview/components/ComponentPatternMock.java
@Override
public String getJspPath() {
return JSP_PATH;
}
@Override
public String getJavaScriptFilePath() {
return JS_PATH;
}
=======
>>>>>>> d578224d2cc2af5c7c7799992f37e6aa3d7fba27:mes-core/src/test/java/com/qcadoo/mes/newview/patterns/ComponentPatternMock.java
} |
| Solution content |
|---|
return getFieldEntityIdChangeListenersMap();
}
@Override
public String getJspFilePath() {
return JSP_PATH;
}
@Override
public String getJavaScriptFilePath() {
return JS_PATH;
}
@Override
public String getJavaScriptObjectName() {
return JS_OBJECT;
}
} |
| File |
|---|
| ComponentPatternMock.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |