Skip to content

Commit f78238d

Browse files
committed
Fix merge conflict
1 parent de5a541 commit f78238d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

v03_pipeline/bin/vep-110-GRCh38.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ gcloud storage cat --billing-project $PROJECT gs://seqr-reference-data/vep/110/h
6161
# gzip -d Homo_sapiens.${ASSEMBLY}.dna.primary_assembly.fa.gz
6262
# bgzip Homo_sapiens.${ASSEMBLY}.dna.primary_assembly.fa
6363
# samtools faidx Homo_sapiens.${ASSEMBLY}.dna.primary_assembly.fa.gz
64-
<<<<<<< HEAD
6564
gcloud storage cp --billing-project $PROJECT "gs://seqr-reference-data/vep/110/Homo_sapiens.${ASSEMBLY}.dna.primary_assembly.fa.*" /vep_data/ &
66-
=======
67-
gcloud storage cp --billing-project $PROJECT 'gs://seqr-reference-data/vep/110/Homo_sapiens.${ASSEMBLY}.dna.primary_assembly.fa.*' /vep_data/ &
68-
>>>>>>> d4af227e6148536cd0b51809d7f3e8a9f029b789
6965
docker pull ${VEP_DOCKER_IMAGE} &
7066
wait
7167

0 commit comments

Comments
 (0)