modif conflit

This commit is contained in:
Nicolas Michard
2008-01-22 11:04:15 +00:00
parent 9529c3f7e0
commit b3a2cbc528
2 changed files with 5 additions and 15 deletions

View File

@@ -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>

View File

@@ -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>