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

diff --git a/CHANGES b/CHANGES
index 3570e2d9802d29f9dece0076d5246b77094a15e5..cc8f6abdf9a58b58dc4ea4fa69b3c537f8833b72 100644 (file)
--- 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 <Juan.Rivera@citrix.com>]