From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 20 Apr 2021 21:07:31 +0000 (+0000)
Subject: Vote [skip ci].
X-Git-Tag: 2.4.47~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec956405b28304cc2aa6b2699ffc06111a33a83d;p=thirdparty%2Fapache%2Fhttpd.git

Vote [skip ci].

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

diff --git a/STATUS b/STATUS
index c952912ac4a..17ff1aa675f 100644
--- a/STATUS
+++ b/STATUS
@@ -169,7 +169,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        r1888723, r1888724, r1888726, r1888729
      PR: https://github.com/apache/httpd/pull/179
      patch: https://github.com/apache/httpd/pull/179.diff
-     +1: icing
+     +1: icing, ylavic
+     ylavic: some "<<<<<<< HEAD" hunk in ap_mmn.h should be remove on
+             backport..
 
   *) mod_socache_shmcb: be safe from socache_shmcb_destroy() late call.  PR 59798
      trunk patch: http://svn.apache.org/r1888266