This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 42d04541ea098c877391672a249a6554f21c2669
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 22 10:57:13 2020 +0100
Fix previous merge conflict.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index c03303d..a34b2ac 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2073,18 +2073,9 @@ public class DefaultServlet extends HttpServlet {
/**
-<<<<<<< HEAD
- * Provides the entity tag (the ETag header) for the given resource
- * attributes. Intended to be over-ridden by custom DefaultServlet
- * implementations that wish to use an alternative format for the entity
- * tag. Such custom implementations that generate strong entity tags may
- * also want to change the default value of
- * {@link #useWeakComparisonWithIfMatch}.
-=======
* Provides the entity tag (the ETag header) for the given resource.
* Intended to be over-ridden by custom DefaultServlet implementations that
* wish to use an alternative format for the entity tag.
->>>>>>> bc379af8e3... Further ETag fixes
*
* @param resourceAttributes The resource attributes for which an entity
* tag is required.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
