httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1705685 - /httpd/httpd/branches/2.4.x/include/httpd.h
Date Mon, 28 Sep 2015 13:13:48 GMT
Author: jim
Date: Mon Sep 28 13:13:48 2015
New Revision: 1705685

URL: http://svn.apache.org/viewvc?rev=1705685&view=rev
Log:
oops2

Modified:
    httpd/httpd/branches/2.4.x/include/httpd.h

Modified: httpd/httpd/branches/2.4.x/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/httpd.h?rev=1705685&r1=1705684&r2=1705685&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/httpd.h (original)
+++ httpd/httpd/branches/2.4.x/include/httpd.h Mon Sep 28 13:13:48 2015
@@ -1550,7 +1550,6 @@ AP_DECLARE(int) ap_find_etag_weak(apr_po
 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.



Mime
View raw message