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

Posted to commits@subversion.apache.org by ju...@apache.org on 2013/03/13 21:39:34 UTC

svn commit: r1456123 - /subversion/trunk/subversion/include/svn_wc.h

Author: julianfoad
Date: Wed Mar 13 20:39:33 2013
New Revision: 1456123

URL: http://svn.apache.org/r1456123
Log:
* subversion/include/svn_wc.h
  (svn_wc_conflict_reason_t): Revert an accidental addition committed in r1456117.

Modified:
    subversion/trunk/subversion/include/svn_wc.h

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1456123&r1=1456122&r2=1456123&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Wed Mar 13 20:39:33 2013
@@ -1604,8 +1604,6 @@ typedef enum svn_wc_conflict_reason_t
   svn_wc_conflict_reason_replaced,
   /** Object is moved away. @since New in 1.8. */
   svn_wc_conflict_reason_moved_away,
-  /** Object is moved away & replaced. @since New in 1.8. */
-  svn_wc_conflict_reason_moved_away_replaced,
   /** Object is moved here. @since New in 1.8. */
   svn_wc_conflict_reason_moved_here