From b3a2cbc5284ec16bde17644a3da5881515876484 Mon Sep 17 00:00:00 2001 From: Nicolas Michard Date: Tue, 22 Jan 2008 11:04:15 +0000 Subject: [PATCH] modif conflit --- .../WebContent/WEB-INF/jsp/createReport.jsp | 2 +- YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp index e7da4bf..f91917f 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp @@ -34,4 +34,4 @@ ">Home - \ No newline at end of file + diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp index cff7bd0..5354790 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp @@ -1,11 +1,7 @@ -<%@ include file="/WEB-INF/decorators/include.jsp"%> - - - - - +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + + @@ -48,11 +44,5 @@ -">Home - - - - -