Author: stsp
Date: Thu May 25 16:02:28 2017
New Revision: 1796159
URL: http://svn.apache.org/viewvc?rev=1796159&view=rev
Log:
* STATUS: Note that r1795116 now conflicts.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1796159&r1=1796158&r2=1796159&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu May 25 16:02:28 2017
@@ -49,6 +49,7 @@ Candidate changes:
^/subversion/branches/1.9.x-r1795116
Votes:
+1: stefan2
+ +0: stsp (text conflict in subversion/tests/libsvn_fs/fs-test.c)
Veto-blocked changes:
=====================
