From d972ac8a363476365077d4f4b7410a33cc321b17 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
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 @@
   <listener>
     <listener-class>at.gv.egiz.bku.online.webapp.SessionTimeout</listener-class>
   </listener>
-  <servlet>
+    <servlet>
     <servlet-name>BKUServlet</servlet-name>
     <servlet-class>at.gv.egiz.bku.online.webapp.BKURequestHandler</servlet-class>
   </servlet>
@@ -54,7 +54,7 @@
     <servlet-name>help</servlet-name>
     <jsp-file>/help.jsp</jsp-file>
   </servlet>
-  <servlet-mapping>
+    <servlet-mapping>
     <servlet-name>BKUServlet</servlet-name>
     <url-pattern>/http-security-layer-request</url-pattern>
   </servlet-mapping>
@@ -110,7 +110,7 @@
   </servlet-mapping>
 	<!--  End STAL Config -->
 
-  <!-- Begin BKU Web Start Config 
+  <!-- Begin BKU Web Start Config
    |   (activate 'include-webstart' profile)
    -->
   <servlet>
@@ -130,14 +130,14 @@
     <servlet-name>JnlpDownloadServlet</servlet-name>
     <url-pattern>/webstart/*</url-pattern>
   </servlet-mapping>
-  
+
   <!-- End BKU Web Start Config -->
 
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>
     <welcome-file>index.jsp</welcome-file>
   </welcome-file-list>
-  <session-config>
+    <session-config>
     <session-timeout>5</session-timeout>
   </session-config>
 </web-app>
-- 
cgit v1.2.3