From 988fbf7eac4e733b5929b1c966344c5178e64f3e Mon Sep 17 00:00:00 2001
From: Graham Leggett <minfrin@apache.org>
Date: Wed, 24 Apr 2002 17:43:53 +0000
Subject: [PATCH] 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
---
 CHANGES | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index be75fd6f2f..a51c6197a5 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
-- 
2.40.0