Author: stsp
Date: Wed May 8 15:09:50 2013
New Revision: 1480313
URL: http://svn.apache.org/r1480313
Log:
* STATUS: Vote for r1470246.
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=1480313&r1=1480312&r2=1480313&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 8 15:09:50 2013
@@ -35,7 +35,7 @@ Candidate changes:
Showing the whole .prej file each time was confusing and ugly when more
than one property was in conflict.
Votes:
- +1: julianfoad
+ +1: julianfoad, stsp
* r1471443, r1471490
Fix a bug in the Summary of Conflicts when using interactive conflict
