Skip to content

Commit

Permalink
fix unresolved merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@nvnieuwk
nvnieuwk committed Sep 20, 2024
1 parent 0e99623 commit 6f687b9
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 235 deletions.
148 changes: 0 additions & 148 deletions modules.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,84 +7,48 @@
"nf-core": {
"bcftools/annotate": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "88ae68490e8f2478a1e1bbeedac970fd7cc73022",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"],
"patch": "modules/nf-core/bcftools/annotate/bcftools-annotate.diff"
},
"bcftools/concat": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "cdf83b18471db290a28fe98c2a0852cb05864890",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["vcf_annotate_ensemblvep_snpeff"]
},
"bcftools/filter": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "33ef773a7ea36e88323902f63662aa53c9b88988",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"bcftools/norm": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "f6cc00f107826cfaf1c933297b10ed1757b41479",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"bcftools/pluginscatter": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "33ef773a7ea36e88323902f63662aa53c9b88988",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["vcf_annotate_ensemblvep_snpeff"]
},
"bcftools/query": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "34ac993e081b32d2170ab790d0386b74122f9d36",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"bcftools/reheader": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "c32611ac6813055b9321d2827678e2f8aebcb394",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"bcftools/sort": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "cdf83b18471db290a28fe98c2a0852cb05864890",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["vcf_annotate_ensemblvep_snpeff"]
},
"bcftools/stats": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "a5ba4d59c2b248c0379b0f8aeb4e7e754566cd1f",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"bedtools/intersect": {
Expand All @@ -94,110 +58,62 @@
},
"bedtools/merge": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "a3d614e4a7b8691a259bcfe33ad80903217d6215",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"bedtools/split": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "6dc8a32e32158bb4d3f9af92c802233b5d4f8e4d",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"ensemblvep/download": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "54c183cba37cac58860d9967feaae54acf9cc3e0",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"ensemblvep/vep": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "54c183cba37cac58860d9967feaae54acf9cc3e0",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["vcf_annotate_ensemblvep_snpeff"]
},
"gatk4/calibratedragstrmodel": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "3f42e07a1133064c569b0dbe182979527bca9e59",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"gatk4/composestrtablefile": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "926e2f394d01c71d3abbdbca9c588630bfe51abf",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"gatk4/createsequencedictionary": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "e6fe277739f5894711405af3e717b2470bd956b5",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"gatk4/genomicsdbimport": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"gatk4/genotypegvcfs": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "8b74c800af3d91e0d7bfbecb902308dc4369071c",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"gatk4/haplotypecaller": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "c332ea831f95f750be962c4b5de655f7a1e6e245",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"gawk": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "cf3ed075695639b0a0924eb0901146df1996dc08",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"mosdepth": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "9bfc81874554e87740bcb3e5e07acf0a153c9ecb",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"multiqc": {
Expand All @@ -212,21 +128,13 @@
},
"rtgtools/pedfilter": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "c1c2a770cfb0bfbf093a2434a27f091ebbc65987",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"],
"patch": "modules/nf-core/rtgtools/pedfilter/rtgtools-pedfilter.diff"
},
"rtgtools/rocplot": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "64770369d851c45c364e410e052ef9a6c3a7d2bb",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"rtgtools/vcfeval": {
Expand All @@ -236,129 +144,73 @@
},
"samtools/convert": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"samtools/faidx": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"samtools/index": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "46eca555142d6e597729fcb682adcc791796f514",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"samtools/merge": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "04fbbc7c43cebc0b95d5b126f6d9fe4effa33519",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"snpeff/snpeff": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "3ad7292d9b8da881386e9d5b58364d7da489b38b",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["vcf_annotate_ensemblvep_snpeff"]
},
"somalier/extract": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "458c882987320e27fc90723ec96c127a243a5497",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"somalier/relate": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "458c882987320e27fc90723ec96c127a243a5497",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"],
"patch": "modules/nf-core/somalier/relate/somalier-relate.diff"
},
"tabix/bgzip": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "b20be35facfc5acdc1259f132ed79339d79e989f",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"tabix/bgziptabix": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "0840b387799172e77510393ed09e4d4ec1bc6d7c",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"tabix/tabix": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "0840b387799172e77510393ed09e4d4ec1bc6d7c",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules", "vcf_annotate_ensemblvep_snpeff"]
},
"untar": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "4e5f4687318f24ba944a13609d3ea6ebd890737d",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"vardictjava": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "e61e5a13ef49c5595986bd31efb85c3f0709a282",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"vcf2db": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "730f3aee80d5f8d0b5fc532202ac59361414d006",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
},
"vcfanno": {
"branch": "master",
<<<<<<< HEAD
"git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48",
=======
"git_sha": "9a8bba5910982ae637dedb8664e3121db77e173f",
>>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1
"installed_by": ["modules"]
}
}
Expand Down
16 changes: 0 additions & 16 deletions modules/nf-core/bcftools/annotate/bcftools-annotate.diff
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions modules/nf-core/ensemblvep/vep/environment.yml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6f687b9

Please sign in to comment.