[jboss-svn-commits] JBL Code SVN: r19924 - labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-05-10 08:25:14 -0400 (Sat, 10 May 2008)
New Revision: 19924

Modified:
   labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
Log:
fixed conflict problem

Modified: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2008-05-10 12:23:27 UTC (rev 19923)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2008-05-10 12:25:14 UTC (rev 19924)
@@ -79,7 +79,6 @@
 		<url-pattern>/logout</url-pattern>
 	</servlet-mapping>
 
-<<<<<<< .working
    <filter>
    	<filter-name>wikiRedirect</filter-name>
    	<filter-class>org.jboss.forge.portal.WikiRedirectFilter</filter-class>