* Add comment [skip ci]

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

diff --git a/STATUS b/STATUS
index 2c690de512f513ee34925d2ab103de548873331a..70e0a8b8cc72942fd74180c997169f780ba0ca14 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -249,6 +249,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport version for 2.4.x of patch:
         svn merge -c 1910157 ^/httpd/httpd/trunk .
      +1: icing
+     rpluem says: This one has conflicts in modules/http2/h2_request.c and
+     modules/http2/h2_version.h.
 
   *) Easy patches: synch 2.4.x and trunk
          - core: constify pointers in ap_expr lookup tables.  ~1/2Kb moves to r/o text section