From: Joe Orton <jorton@apache.org>
Date: Mon, 14 Nov 2016 10:36:08 +0000 (+0000)
Subject: Fix mis-merge and revert local change accidentally committed.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=629f7402a1a03fc3756ab0cce4eb815afca1fb72;p=thirdparty%2Fapache%2Fhttpd.git

Fix mis-merge and revert local change accidentally committed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1769589 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 76cd1c9baf1..e68815ee43c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -114,7 +114,6 @@ Changes with Apache 2.4.24
   *) mod_dav: Add support for childtags to dav_error.
      [Jari Urpalainen <jari.urpalainen nokia.com>]
 
->>>>>>> .merge-right.r1769587
   *) mod_proxy_fcgi: Fix 2.4.23 breakage for mod_rewrite per-dir and query 
      string showing up in SCRIPT_FILENAME. PR59815
 
diff --git a/configure.in b/configure.in
index a56187d3bc9..c59c54257cf 100644
--- a/configure.in
+++ b/configure.in
@@ -158,9 +158,7 @@ else
    ifdef([APR_FIND_APU], [
      APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 
                   1, ${apr_major_version})
-   ], [apu_found=no
-      AC_MSG_NOTICE([APR-util 1.x not supported with APR 1.x])
-      ])
+   ], [apu_found=no])
 fi
 
 if test "$apu_found" = "no"; then