This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new d8f486c7e5 Fix merge error in comment
d8f486c7e5 is described below
commit d8f486c7e52e62cba70368b73780e4a5d058ca5e
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 12 12:52:03 2026 +0100
Fix merge error in comment
---
java/org/apache/jasper/compiler/Parser.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Parser.java
b/java/org/apache/jasper/compiler/Parser.java
index 08f079ccf1..d07412792f 100644
--- a/java/org/apache/jasper/compiler/Parser.java
+++ b/java/org/apache/jasper/compiler/Parser.java
@@ -1034,10 +1034,7 @@ class Parser implements TagConstants {
/*
* StandardAction ::= 'include' StdActionContent | 'forward'
StdActionContent | 'invoke' StdActionContent | 'doBody'
* StdActionContent | 'getProperty' StdActionContent | 'setProperty'
StdActionContent | 'useBean' StdActionContent |
- * 'plugin' StdActionContent | 'element' StdActionContent =======
StandardAction ::= 'include' StdActionContent |
- * 'forward' StdActionContent | 'invoke' StdActionContent | 'doBody'
StdActionContent | 'getProperty'
- * StdActionContent | 'setProperty' StdActionContent | 'useBean'
StdActionContent | 'plugin' StdActionContent |
- * 'element' StdActionContent >>>>>>> 76d2ad0a5d (Code clean-up.
Formatting. No functional change.)
+ * 'plugin' StdActionContent | 'element' StdActionContent
*/
private void parseStandardAction(Node parent) throws JasperException {
Mark start = reader.mark();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
