Author: markt
Date: Wed May 16 14:10:54 2018
New Revision: 1831720
URL: http://svn.apache.org/viewvc?rev=1831720&view=rev
Log:
Fix merge
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1831720&r1=1831719&r2=1831720&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Wed May 16 14:10:54 2018
@@ -161,7 +161,6 @@ where jsp files is\n\
or any number of\n\
\ <file> A file to be parsed as a JSP page\n\
where options include:\n\
-<<<<<<< .working
\ -help Print this help message\n\
\ -v Verbose mode\n\
\ -d <dir> Output Directory (default -Djava.io.tmpdir)\n\
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
