* Add comment [skip ci]

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

diff --git a/STATUS b/STATUS
index 70e0a8b8cc72942fd74180c997169f780ba0ca14..580a83e32f7b1ea9deb9d6a6ce626e79d4403489 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -296,6 +296,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         svn merge -c 1910331,1910441 ^/httpd/httpd/trunk .
      +1: icing
      # reset vote due to addition of r1910441
+     rpluem says: r1910441 has a conflict in modules/http2/h2_version.h
+     and the patch for PR 66646 needs to go in before this one to avoid further
+     conflicts.
 
   *) mod_http2: Fix for PR 66646.
      Trunk version of patch: