You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ph...@apache.org on 2011/07/29 18:48:44 UTC

svn commit: r1152299 - /subversion/branches/1.7.x/STATUS

Author: philip
Date: Fri Jul 29 16:48:43 2011
New Revision: 1152299

URL: http://svn.apache.org/viewvc?rev=1152299&view=rev
Log:
* STATUS: note merge conflict

Modified:
    subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1152299&r1=1152298&r2=1152299&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Jul 29 16:48:43 2011
@@ -189,6 +189,7 @@ Candidate changes:
      Easy to trigger problem in tree conflict situations.
    Votes:
      +1: rhuijben
+     +0: philip (looks OK, but merge conflicts)
 
 Veto-blocked changes:
 =====================