Commit 5f26d8d7 authored by Swati Parekh's avatar Swati Parekh
Browse files

Merge branch 'zUMIs-dev' of https://github.com/sdparekh/zUMIs into zUMIs-dev

Conflicts:
	fqfilter_v2.pl
parents 3b5b0f80 cd850b06
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -17,7 +17,18 @@ $samtoolsexc=$ARGV[1];
$rscriptexc=$ARGV[2];
$pigz=$ARGV[3];
$zumisdir=$ARGV[4];
<<<<<<< HEAD
$tmpPrefix=$ARGV[5];
=======
=begin
chomp($zumisdir);
print $zumisdir;
print $yml;
print $samtoolsexc;
print $pigz;
print $rscriptexc;
=cut
>>>>>>> 261c7b5e34f7f6fc33a3c1cb03c0dfb09eb3bd28
}
use lib "$zumisdir";
use distilReads;