On the 1.14.x branch:

Vote for r1892118, approving



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.14.x@1927160 13f79535-47bb-0310-9956-ffa450edef68

Author: dsahlberg-apache-org

STATUS

@@ -30,15 +30,16 @@ Candidate changes:
   Votes:
     +1: jamessan
 
+Veto-blocked changes:
+=====================
+
+Approved changes:
+=================
+
 * r1892118
   Fix a NULL pointer dereference in the conflict resolver.
   Justification:
     1.14.5 users are running into this crash.
   Votes:
    +1: stsp, rinrab
 
-Veto-blocked changes:
-=====================
-
-Approved changes:
-=================