From 1968b65ca86f6a5bf5142049366462aa86a0768c Mon Sep 17 00:00:00 2001
From: David Roazen <droazen@broadinstitute.org>
Date: Mon, 15 Aug 2011 18:45:21 -0400
Subject: [PATCH] Revert "Remove merge-added ======'s so this compiles"

This reverts commit be028b6513a129f81aa6f3593ea7d396c0e8fc25.
---
 public/java/src/org/broadinstitute/sting/utils/MathUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/java/src/org/broadinstitute/sting/utils/MathUtils.java b/public/java/src/org/broadinstitute/sting/utils/MathUtils.java
index 75bb0151a..8c35119dd 100644
--- a/public/java/src/org/broadinstitute/sting/utils/MathUtils.java
+++ b/public/java/src/org/broadinstitute/sting/utils/MathUtils.java
@@ -1418,6 +1418,7 @@ 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 };