From: Stefan Eissing <icing@apache.org>
Date: Tue, 11 May 2021 08:42:09 +0000 (+0000)
Subject: update proposal [skip ci]
X-Git-Tag: 2.4.48~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b5c5b9f581966ed3ccced901981c9ad6b69e777;p=thirdparty%2Fapache%2Fhttpd.git

update proposal [skip ci]


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

diff --git a/STATUS b/STATUS
index a06768c3485..3e0aa0a7aa2 100644
--- a/STATUS
+++ b/STATUS
@@ -192,7 +192,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: icing, ylavic
      ylavic: some "<<<<<<< HEAD" hunk in ap_mmn.h should be remove on
              backport..
-    jailletc36: pull/179 has been updated with r1889009
+     jailletc36: pull/179 has been updated with r1889009
+     icing: fixed the merge garbage in ap_mmn.h. thanks Yann.
 
   *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
      trunk patch: http://svn.apache.org/r1884505