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

Posted to commits@subversion.apache.org by st...@apache.org on 2013/05/16 23:24:06 UTC

svn commit: r1483571 - /subversion/branches/1.8.x/STATUS

Author: stefan2
Date: Thu May 16 21:24:06 2013
New Revision: 1483571

URL: http://svn.apache.org/r1483571
Log:
* STATUS: remove conflict marker accidentally committed in r1483565

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=1483571&r1=1483570&r2=1483571&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu May 16 21:24:06 2013
@@ -141,7 +141,6 @@ Approved for 1.8.1 or when we release a 
    Votes:
      +1: philip, rhuijben, stsp
 
->>>>>>> .r1483563
 Veto-blocked changes:
 =====================