From: Rainer Jung <rjung@apache.org>
Date: Fri, 9 Aug 2019 08:30:21 +0000 (+0000)
Subject: ENOCOFFEE.
X-Git-Tag: 2.4.41~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9c55a124b63719b9a3d599f074bf1953c68d427;p=thirdparty%2Fapache%2Fhttpd.git

ENOCOFFEE.


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

diff --git a/STATUS b/STATUS
index 7f56f67795a..332989a01ef 100644
--- a/STATUS
+++ b/STATUS
@@ -164,8 +164,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch:  http://svn.apache.org/r1709121
      2.4.x patch:  svn merge -c 1709121  ^/httpd/httpd/trunk .
      +1: covener, jorton, 
-     rjung: shouldn't the merging respect the "add" set flag? Otherwise it seems
-            impossible to merge a 0 value on top of a non-zero value.
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED