Commit 2c80b796 authored by Jean-Frederic Clere's avatar Jean-Frederic Clere
Browse files

Cast my vote.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@540038 13f79535-47bb-0310-9956-ffa450edef68
parent 8f0486d1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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