svn commit: r1679789 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java

[oh...@apache.org]

Author: oheger
Date: Sat May 16 17:48:19 2015
New Revision: 1679789

URL: http://svn.apache.org/r1679789
Log:
Javadoc error: Unexpected end tag.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java?rev=1679789&r1=1679788&r2=1679789&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java Sat May 16 17:48:19 2015
@@ -31,13 +31,13 @@ import org.apache.commons.lang3.ObjectUt
  * </p>
  * <p>
  * This combiner performs the merge using a few rules:
+ * </p>
  * <ol>
  * <li>Nodes can be merged when attributes that appear in both have the same value.</li>
  * <li>Only a single node in the second file is considered a match to the node in the first file.</li>
  * <li>Attributes in nodes that match are merged.
  * <li>Nodes in both files that do not match are added to the result.</li>
  * </ol>
- * </p>
  *
  * @version $Id$
  * @since 1.7