From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 23 Sep 2021 07:25:24 +0000 (+0000)
Subject: * Comment [skip ci]
X-Git-Tag: candidate-2.4.50-rc1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fa647908fa2a7a52a81533de05673808e0b3863;p=thirdparty%2Fapache%2Fhttpd.git

* 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 5890e2ddea6..7207fb35cfc 100644
--- 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