From d2582bf28f2eafe590e77a8afc65f24de277be04 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Fri, 22 Nov 2002 12:41:40 +0000 Subject: [PATCH] All hail the conflict. PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97598 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3570e2d980..cc8f6abdf9 100644 --- a/CHANGES +++ b/CHANGES @@ -22,7 +22,6 @@ Changes with Apache 2.0.44 the else path (using the default expiration) if date is equal to lastmod. [rx@armstrike.com (Sergey), Paul J. Reder] ->>>>>>> 1.989 *) Use AP_DECLARE in the debug versions of ap_strXXX in case the default calling convention is not the same as the one used by AP_DECLARE. [Juan Rivera ] -- 2.50.1