* Comment [skip ci]

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

diff --git a/STATUS b/STATUS
index 5890e2ddea6c3dd13bfa8ca08d194e9d9cbf7bfb..7207fb35cfc98e22d44844236bbd59bf0125cf08 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -163,6 +163,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/1893220
      2.4.x patch: svn merge -c 1893214,1893215,1893220 ^/httpd/httpd/trunk .
      +1: icing,
+     rpluem says: This one has merge conflicts.
 
    *) mod_speling: Backport CheckBasenameMatch for PR44221
       trunk patch: http://svn.apache.org/r1557580