]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
ENOCOFFEE.
authorRainer Jung <rjung@apache.org>
Fri, 9 Aug 2019 08:30:21 +0000 (08:30 +0000)
committerRainer Jung <rjung@apache.org>
Fri, 9 Aug 2019 08:30:21 +0000 (08:30 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1864774 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 7f56f67795a6e22909bc30843f0e62e0e3b40b4c..332989a01efdc55e396f46017ad5b70c637b6c87 100644 (file)
--- 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