svn commit: r1799159 - /jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java

[stillalex]

Author: stillalex
Date: Mon Jun 19 08:49:26 2017
New Revision: 1799159

URL: http://svn.apache.org/viewvc?rev=1799159&view=rev
Log:
OAK-6365 oak-store-spi fails on javadoc


Modified:
    
jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java

Modified: 
jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java?rev=1799159&r1=1799158&r2=1799159&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java
 Mon Jun 19 08:49:26 2017
@@ -53,7 +53,7 @@ public class CompositeConflictHandler im
 
     /**
      * Create a new {@code CompositeConflictHandler} with an initial set of
-     * backing handler. Use {@link #addHandler(PartialConflictHandler)} to add 
additional
+     * backing handler. Use {@link #addHandler(ThreeWayConflictHandler)} to 
add additional
      * handlers.
      * @param handlers  the backing handlers
      */
@@ -63,7 +63,7 @@ public class CompositeConflictHandler im
 
     /**
      * Create a new {@code CompositeConflictHandler} with no backing handlers.
-     * backing handler. Use {@link #addHandler(PartialConflictHandler)} to add 
handlers.
+     * backing handler. Use {@link #addHandler(ThreeWayConflictHandler)} to 
add handlers.
      */
     public CompositeConflictHandler() {
         this.handlers = newLinkedList();