Author: danielsh
Date: Wed Oct 19 17:11:19 2011
New Revision: 1186345
URL: http://svn.apache.org/viewvc?rev=1186345&view=rev
Log:
Add a trivial change to avoid merge conflicts.
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=1186345&r1=1186344&r2=1186345&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 17:11:19 2011
@@ -64,7 +64,7 @@ Candidate changes:
Votes:
+1: rhuijben, philip
- * r1186231
+ * r1186121, r1186231
FSFS: Fix validation so it doesn't hork preexisting repositories that
triggered a bug once in their history.
Justification:
