Author: stsp
Date: Thu May 9 13:39:39 2013
New Revision: 1480630
URL: http://svn.apache.org/r1480630
Log:
* STATUS: Clarify that my r1470246 vote is for 1.8.0 only.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1480630&r1=1480629&r2=1480630&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu May 9 13:39:39 2013
@@ -35,7 +35,8 @@ Candidate changes:
Showing the whole .prej file each time was confusing and ugly when more
than one property was in conflict.
Votes:
- +1: julianfoad, stsp
+ +1: julianfoad
+ +1: stsp (for 1.8.0, but not any 1.8.x since it changes the UI)
* r1471443, r1471490
Fix a bug in the Summary of Conflicts when using interactive conflict
