From: Jim Jagielski <jim@apache.org>
Date: Mon, 28 Sep 2015 13:13:48 +0000 (+0000)
Subject: oops2
X-Git-Tag: 2.4.17~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9eab1128cd7528bb31396fac0b117823c93dd930;p=apache

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 beb1a455f7..4204cd0484 100644
--- 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.