From 5aa61fefec8442de1826343154e4f83c89704ede Mon Sep 17 00:00:00 2001
From: Christopher Hartl <chartl@broadinstitute.org>
Date: Mon, 15 Aug 2011 16:53:05 -0400
Subject: [PATCH] Remove merge-added ======'s so this compiles

---
 public/java/src/org/broadinstitute/sting/utils/MathUtils.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/java/src/org/broadinstitute/sting/utils/MathUtils.java b/public/java/src/org/broadinstitute/sting/utils/MathUtils.java
index 8c35119dd..75bb0151a 100644
--- a/public/java/src/org/broadinstitute/sting/utils/MathUtils.java
+++ b/public/java/src/org/broadinstitute/sting/utils/MathUtils.java
@@ -1418,7 +1418,6 @@ public class MathUtils {
         return 1.0-(new ChiSquare(contingencyTable.length*contingencyTable[0].length,null)).cdf(chi);
     }
 
-=======
     public static double marginalizedFisherExact(double[] spectrum1, double[] spectrum2, int ns1, int ns2) {
         int N = ns1 + ns2;
         int[] rowSums = { ns1, ns2 };