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>
</body>
</html>
</html>