Fix merge

Author: lvaruzza

bin/quantileFilter

@@ -1,20 +1,3 @@
-<<<<<<< HEAD
-#!/bin/bash
-VERSION=0.0.1
-BIN=`dirname $0`
-BASE=$BIN/../
-HADOOP=$HADOOP_HOME/bin/hadoop
-if test ! -f $HADOOP; then
-    HADOOP=`which hadoop`
-    if test ! -f $HADOOP; then
-	echo Missing hadoop executable, please put it in the path or set the HADOOP_HOME variable.
-	exit
-    fi
-fi
-
-$HADOOP jar $BASE/target/bioseq-$VERSION.jar com.lifetech.hadoop.bioseq.transform.QuantileFilter -libjars $BASE/target/lib/uncommons-maths-1.2.2.jar $*
- 
-=======
 BIN=`dirname $0`
 
 source $BIN/common.sh
@@ -34,4 +17,3 @@ echo $BIN/seqfile2fasta -i $FILTERED -o $FILTERED-fasta
 echo "$HADOOP dfs -cat $FILTERED-fasta/fasta* > $OUTPUT.fasta"
 echo "$HADOOP dfs -cat $FILTERED-fasta/qual* > $OUTPUT.qual"
 
->>>>>>> 96d0740ff5d04e74282d3ea20f8e91523779d031