Commit 3dcc33bd authored by Daniel Schramm's avatar Daniel Schramm
Browse files

Forgotten merge conflict message resolved

parent 0b63e7c4

MeshModel/src/main/java/cz/fidentis/analyst/kdtree/KdTree.java

+1 −5
Original line number Diff line number Diff line
@@ -134,9 +134,6 @@ public class KdTree implements Serializable { 
    }

    

    /**

<<<<<<< HEAD

     * Visits this tree.

=======

     * Return number of nodes in the k-d tree.

     * @return number of nodes in the k-d tree

     */
@@ -183,8 +180,7 @@ public class KdTree implements Serializable { 
    }

    

    /**

     * Visits this facet.

>>>>>>> origin/master

     * Visits this tree.

     * 

     * @param visitor Visitor

     */