Author: philip
Date: Thu Jan 26 14:11:28 2012
New Revision: 1236184
URL: http://svn.apache.org/viewvc?rev=1236184&view=rev
Log:
* STATUS: Note conflict.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1236184&r1=1236183&r2=1236184&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Jan 26 14:11:28 2012
@@ -152,6 +152,7 @@ Candidate changes:
r1236099 updates neon.
The changes are independent, but as it changes how the config file
behaves, I think both should be applied at the same time. (rhuijben)
+ Needs branch as r1236099 gives a merge conflict. (philip)
Votes:
+1: rhuijben, gstein
