modif conflit
This commit is contained in:
@@ -34,4 +34,4 @@
|
|||||||
|
|
||||||
<a href="<c:url value="main.htm"/>">Home</a>
|
<a href="<c:url value="main.htm"/>">Home</a>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,11 +1,7 @@
|
|||||||
<%@ include file="/WEB-INF/decorators/include.jsp"%>
|
<%@ include file="/WEB-INF/decorators/include.jsp"%>
|
||||||
|
|
||||||
|
<html>
|
||||||
<!--
|
<head></head>
|
||||||
<%@ page session="false" %> spring -> true par defaut
|
|
||||||
-->
|
|
||||||
<html>
|
|
||||||
<head></head>
|
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
|
||||||
@@ -48,11 +44,5 @@
|
|||||||
|
|
||||||
</form:form>
|
</form:form>
|
||||||
|
|
||||||
<a href="<c:url value="main.htm"/>">Home</a>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user