oops2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705685 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/httpd.h b/include/httpd.h
index beb1a455f76347cbf8bab0f37f6533ab3e2eacfa..4204cd04840228a432730d44277fa7ba80b2fa09 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1550,7 +1550,6 @@ AP_DECLARE(int) ap_find_etag_weak(apr_pool_t *p, const char *line, const char *t
 AP_DECLARE(int) ap_find_etag_strong(apr_pool_t *p, const char *line, const char *tok);
 
 /**
-<<<<<<< .working
  * Retrieve an array of tokens in the format "1#token" defined in RFC2616. Only
  * accepts ',' as a delimiter, does not accept quoted strings, and errors on
  * any separator.