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 be75fd6f2fcaf25369d0da1d3e543481604f7187..a51c6197a5045feb22045151851fa8cbd89e63e8 100644 (file)
--- 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