From 030a1462f77b752e49357fff7b74cf0626823e1c Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Mon, 21 May 2007 06:41:27 +0000 Subject: [PATCH] Cast my vote. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@540038 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/STATUS b/STATUS index b979ca46bc4..c578d7bc733 100644 --- a/STATUS +++ b/STATUS @@ -227,7 +227,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/viewvc?view=rev&revision=534031 2.2.x version of patch: http://people.apache.org/~rpluem/patches/40310.diff - +1: rpluem + +1: rpluem, jfclere jerenkrantz says: Does not apply cleanly to 2.2.x. rpluem answers: svn merge did not notice this / resolved this, but you are correct. There is a conflict because r467014 is not -- 2.47.2