zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing conflicts

This commit is contained in:
Mauricio Carneiro 2012-06-26 17:12:24 -04:00
parent 1f45551a15 91f02dfd85
commit bbd46690e6
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/scala/test/org/broadinstitute/sting/queue/pipeline/DataProcessingPipelineTest.scala
View File

@ -39,7 +39,6 @@ class DataProcessingPipelineTest {
" -R " + BaseTest.publicTestDir + "exampleFASTA.fasta", " -R " + BaseTest.publicTestDir + "exampleFASTA.fasta",
" -i " + BaseTest.publicTestDir + "exampleBAM.bam", " -i " + BaseTest.publicTestDir + "exampleBAM.bam",
" -D " + BaseTest.publicTestDir + "exampleDBSNP.vcf", " -D " + BaseTest.publicTestDir + "exampleDBSNP.vcf",
" -nv ",
" -test ", " -test ",
" -p " + projectName).mkString " -p " + projectName).mkString
spec.fileMD5s += testOut -> "0de95b5642e41e11ecd6fa1770242b88" spec.fileMD5s += testOut -> "0de95b5642e41e11ecd6fa1770242b88"
@ -57,7 +56,6 @@ class DataProcessingPipelineTest {
" -R " + BaseTest.publicTestDir + "exampleFASTA.fasta", " -R " + BaseTest.publicTestDir + "exampleFASTA.fasta",
" -i " + BaseTest.publicTestDir + "exampleBAM.bam", " -i " + BaseTest.publicTestDir + "exampleBAM.bam",
" -D " + BaseTest.publicTestDir + "exampleDBSNP.vcf", " -D " + BaseTest.publicTestDir + "exampleDBSNP.vcf",
" -nv ",
" -test ", " -test ",
" -bwa /home/unix/carneiro/bin/bwa", " -bwa /home/unix/carneiro/bin/bwa",
" -bwape ", " -bwape ",