diff --git a/webapp/web/templates/edit/specific/merge_result.jsp b/webapp/web/templates/edit/specific/merge_result.jsp new file mode 100644 index 000000000..8176e8535 --- /dev/null +++ b/webapp/web/templates/edit/specific/merge_result.jsp @@ -0,0 +1,10 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> + + +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> + +
+ +<%=result%>
\ No newline at end of file