From: Graham Leggett <minfrin@apache.org>
Date: Wed, 24 Apr 2002 17:43:53 +0000 (+0000)
Subject: Oooops!
X-Git-Tag: 2.0.36~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a630e71b2e2fa84e8a7fce2814932d4eb5fb70d3;p=thirdparty%2Fapache%2Fhttpd.git

Oooops!
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94786 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index be75fd6f2fc..a51c6197a50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,7 +26,6 @@ Changes with Apache 2.0.36
   *) Fix perchild MPM so that it uses ap_gname2id for groups instead of
      ap_uname2id. [Scott Lamb <slamb@slamb.org>]
 
->>>>>>> 1.728
   *) Fix AcceptPathInfo. PR 8234  [Cliff Woolley]
 
   *) [Security] Added the APLOG_TOCLIENT flag to ap_log_rerror() to