Merge bug fixes

This commit is contained in:
Guillermo del Angel 2011-07-19 14:36:20 -04:00
parent 989dd17f95
commit e6d306458c
1 changed files with 0 additions and 4 deletions

View File

@ -24,11 +24,8 @@
package org.broadinstitute.sting.gatk.walkers.variantutils;
<<<<<<< HEAD
import org.broadinstitute.sting.utils.MathUtils;
import org.broadinstitute.sting.utils.variantcontext.VariantContext;
=======
>>>>>>> 9de6bab260a6bfca0aabf2c9d650dd2dad3ebe20
import org.broadinstitute.sting.commandline.Argument;
import org.broadinstitute.sting.commandline.Output;
import org.broadinstitute.sting.gatk.contexts.AlignmentContext;
@ -38,7 +35,6 @@ import org.broadinstitute.sting.gatk.walkers.Requires;
import org.broadinstitute.sting.gatk.walkers.RodWalker;
import org.broadinstitute.sting.utils.Utils;
import org.broadinstitute.sting.utils.exceptions.UserException;
import org.broadinstitute.sting.utils.variantcontext.VariantContext;
import org.broadinstitute.sting.utils.variantcontext.VariantContextUtils;
import java.io.PrintStream;