Bad conflict merge before

2012-04-12 09:56:49 -04:00 · 2012-04-12 09:56:49 -04:00 · f77a6d18b8
parent 33a8bdd75f
commit f77a6d18b8
1 changed files with 1 additions and 1 deletions
--- a/public/java/src/org/broadinstitute/sting/utils/variantcontext/GenotypeLikelihoods.java
+++ b/public/java/src/org/broadinstitute/sting/utils/variantcontext/GenotypeLikelihoods.java
@ -223,7 +223,7 @@ public class GenotypeLikelihoods {
    /**
     * The maximum number of alleles that we can represent as genotype likelihoods
     */
-    final static int MAX_ALLELES_THAT_CAN_BE_GENOTYPED = 50;
+    public final static int MAX_ALLELES_THAT_CAN_BE_GENOTYPED = 50;

    /*
     * a cache of the PL index to the 2 alleles it represents over all possible numbers of alternate alleles