From d972ac8a363476365077d4f4b7410a33cc321b17 Mon Sep 17 00:00:00 2001 From: clemenso Date: Thu, 9 Jul 2009 14:08:32 +0000 Subject: conflict resolved? git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@405 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- BKUOnline/src/main/webapp/WEB-INF/web.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml index e69c64f1..9b286351 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/web.xml +++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml @@ -29,7 +29,7 @@ at.gv.egiz.bku.online.webapp.SessionTimeout - + BKUServlet at.gv.egiz.bku.online.webapp.BKURequestHandler @@ -54,7 +54,7 @@ help /help.jsp - + BKUServlet /http-security-layer-request @@ -110,7 +110,7 @@ - @@ -130,14 +130,14 @@ JnlpDownloadServlet /webstart/* - + index.html index.jsp - + 5 -- cgit v1.2.3