Fixing warnings

broadinstitute · Jun 25, 2015 · 4690240 · 4690240
1 parent 102e10f
commit 4690240
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/src/main/java/org/broadinstitute/hellbender/dev/pipelines/bqsr/BQSRTransform.java b/src/main/java/org/broadinstitute/hellbender/dev/pipelines/bqsr/BQSRTransform.java
@@ -19,15 +19,9 @@
  *     PCollectionTuple.of(BaseRecalibratorDataflowUtils.readTag, reads)
  *                     .and(BaseRecalibratorDataflowUtils.intervalTag, intervals);
  */
-<<<<<<< HEAD
 public final class BQSRTransform extends PTransform<PCollectionTuple, PCollection<BaseRecalOutput>> {
     private static final long serialVersionUID = 1L;
 
-=======
-public final class BQSRTransform extends PTransform<PCollectionTuple, PCollection<RecalibrationTables>> {
-    private static final long serialVersionUID = 1L;
->>>>>>> c9c78223b4de3d84e8bf75111ed6805fac1557bc
-
     private final SAMFileHeader header;
     // local or GCS
     private final String referencePath;

diff --git a/src/test/java/org/broadinstitute/hellbender/tools/picard/vcf/GatherVcfsUnitTest.java b/src/test/java/org/broadinstitute/hellbender/tools/picard/vcf/GatherVcfsUnitTest.java
@@ -14,11 +14,8 @@
 import java.util.*;
 
 public final class GatherVcfsUnitTest {
-<<<<<<< HEAD
     //tests for GatherVcfs, specifically areAllBlockCompressed
-=======
-    //tests for GatherVcfs, specifically areAllBlockCompressed()
->>>>>>> c9c78223b4de3d84e8bf75111ed6805fac1557bc
+
 
     @DataProvider(name = "files")
     public Object[][] files(){
@@ -35,11 +32,7 @@ public Object[][] files(){
     }
 
     @Test(dataProvider = "files")
-<<<<<<< HEAD
     public void testareAllBlockCompressed(List<File> files, boolean expected) throws IOException {
-=======
-    public void testaABC(List<File> files, boolean expected) throws IOException {
->>>>>>> c9c78223b4de3d84e8bf75111ed6805fac1557bc
         Assert.assertEquals(GatherVcfs.areAllBlockCompressed(files), expected);
     }