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 a06768c3485508a53f2dfe5d03082ed9122df95b..3e0aa0a7aa2aa07250ad4be642679279fcf51e95 100644 (file)
--- 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