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 c952912ac4ac99b2fe04e33d46c26862c815316c..17ff1aa675f50d335894885dad1f5b49253222d2 100644 (file)
--- 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