Author: dsahlberg
Date: Sat Jul 12 21:08:34 2025
New Revision: 1927160
URL: http://svn.apache.org/viewvc?rev=1927160&view=rev
Log:
On the 1.14.x branch:
Vote for r1892118, approving
Modified:
subversion/branches/1.14.x/STATUS
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1927160&r1=1927159&r2=1927160&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jul 12 21:08:34 2025
@@ -30,6 +30,12 @@ Candidate changes:
Votes:
+1: jamessan
+Veto-blocked changes:
+=====================
+
+Approved changes:
+=================
+
* r1892118
Fix a NULL pointer dereference in the conflict resolver.
Justification:
@@ -37,8 +43,3 @@ Candidate changes:
Votes:
+1: stsp, rinrab
-Veto-blocked changes:
-=====================
-
-Approved changes:
-=================
