* Comment

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

diff --git a/STATUS b/STATUS
index ca60f42838abf39c5b0d9b2b9929f87d0e026a33..34341a6f814ed561fad4be487135a6eceb07ec4f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -242,6 +242,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       trunk patch: http://svn.apache.org/r1915281
       2.4.x patch: svn merge -c 1915281 ^/httpd/httpd/trunk .
       +1: icing,
+      rpluem says: This has conflict in modules/http2/h2_version.h. Otherwise
+      +1 from me on the backport.
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED