Author: markt
Date: Tue Oct 25 11:25:56 2011
New Revision: 1188612
URL: http://svn.apache.org/viewvc?rev=1188612&view=rev
Log:
Fix missing new line in r1188313
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?rev=1188612&r1=1188611&r2=1188612&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties Tue
Oct 25 11:25:56 2011
@@ -24,7 +24,8 @@ webXml.reservedName=A web.xml file was d
webXml.mergeConflictDisplayName=The display name was defined in multiple
fragments with different values including fragment with name [{0}] located at
[{1}]
webXml.mergeConflictFilter=The Filter [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
webXml.mergeConflictLoginConfig=A LoginConfig was defined inconsistently in
multiple fragments including fragment with name [{0}] located at [{1}]
-webXml.mergeConflictOrder=Fragment relative ordering contains circular
references. This can be resolved by using absolute ordering in
web.xml.webXml.mergeConflictResource=The Resource [{0}] was defined
inconsistently in multiple fragments including fragment with name [{1}] located
at [{2}]
+webXml.mergeConflictOrder=Fragment relative ordering contains circular
references. This can be resolved by using absolute ordering in web.xml.
+webXml.mergeConflictResource=The Resource [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
webXml.mergeConflictServlet=The Servlet [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
webXml.mergeConflictSessionCookieName=The session cookie name was defined
inconsistently in multiple fragments with different values including fragment
with name [{0}] located at [{1}]
webXml.mergeConflictSessionCookieDomain=The session cookie domain was defined
inconsistently in multiple fragments with different values including fragment
with name [{0}] located at [{1}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
