Fix Calc centroid and center of mass documentation

lafita · lafita · commit 01287d737aa1 · 2016-08-31T10:33:29.000+02:00
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Calc.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Calc.java
@@ -764,11 +764,7 @@ public static final void shift(Group group, Atom a) {
 	}
 
 	/**
-<<<<<<< HEAD
 	 * Returns the centroid of the set of atoms.
-=======
-	 * Returns the center of mass of the set of atoms.
->>>>>>> refs/heads/quaternion
 	 * 
 	 * @param atomSet
 	 *            a set of Atoms
@@ -799,6 +795,14 @@ public static final Atom getCentroid(Atom[] atomSet) {
 
 	}
 
+	/**
+	 * Returns the center of mass of the set of atoms. Atomic masses of the
+	 * Atoms are used.
+	 * 
+	 * @param atomSet
+	 *            a set of Atoms
+	 * @return an Atom representing the center of mass
+	 */
 	public static Atom centerOfMass(Atom[] points) {
 		Atom center = new AtomImpl();
 
