diff --git a/modules.json b/modules.json index 8f6c09e3..19d1e586 100644 --- a/modules.json +++ b/modules.json @@ -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": { @@ -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": { @@ -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": { @@ -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"] } } diff --git a/modules/nf-core/bcftools/annotate/bcftools-annotate.diff b/modules/nf-core/bcftools/annotate/bcftools-annotate.diff index e284f014..518cee56 100644 --- a/modules/nf-core/bcftools/annotate/bcftools-annotate.diff +++ b/modules/nf-core/bcftools/annotate/bcftools-annotate.diff @@ -1,9 +1,4 @@ Changes in module 'nf-core/bcftools/annotate' -<<<<<<< HEAD -'modules/nf-core/bcftools/annotate/environment.yml' is unchanged -'modules/nf-core/bcftools/annotate/meta.yml' is unchanged -======= ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 Changes in 'bcftools/annotate/main.nf': --- modules/nf-core/bcftools/annotate/main.nf +++ modules/nf-core/bcftools/annotate/main.nf @@ -18,16 +13,6 @@ Changes in 'bcftools/annotate/main.nf': output: tuple val(meta), path("*.{vcf,vcf.gz,bcf,bcf.gz}"), emit: vcf -<<<<<<< HEAD -'modules/nf-core/bcftools/annotate/tests/main.nf.test.snap' is unchanged -'modules/nf-core/bcftools/annotate/tests/tags.yml' is unchanged -'modules/nf-core/bcftools/annotate/tests/vcf_gz_index.config' is unchanged -'modules/nf-core/bcftools/annotate/tests/vcf_gz_index_tbi.config' is unchanged -'modules/nf-core/bcftools/annotate/tests/vcf.config' is unchanged -'modules/nf-core/bcftools/annotate/tests/main.nf.test' is unchanged -'modules/nf-core/bcftools/annotate/tests/bcf.config' is unchanged -'modules/nf-core/bcftools/annotate/tests/vcf_gz_index_csi.config' is unchanged -======= 'modules/nf-core/bcftools/annotate/environment.yml' is unchanged 'modules/nf-core/bcftools/annotate/meta.yml' is unchanged 'modules/nf-core/bcftools/annotate/tests/tags.yml' is unchanged @@ -38,5 +23,4 @@ Changes in 'bcftools/annotate/main.nf': 'modules/nf-core/bcftools/annotate/tests/bcf.config' is unchanged 'modules/nf-core/bcftools/annotate/tests/vcf_gz_index.config' is unchanged 'modules/nf-core/bcftools/annotate/tests/main.nf.test.snap' is unchanged ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 ************************************************************ diff --git a/modules/nf-core/ensemblvep/vep/environment.yml b/modules/nf-core/ensemblvep/vep/environment.yml index 5fe0afb1..87b88372 100644 --- a/modules/nf-core/ensemblvep/vep/environment.yml +++ b/modules/nf-core/ensemblvep/vep/environment.yml @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= name: ensemblvep_vep ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 channels: - conda-forge - bioconda diff --git a/modules/nf-core/rtgtools/pedfilter/rtgtools-pedfilter.diff b/modules/nf-core/rtgtools/pedfilter/rtgtools-pedfilter.diff index a8ca8d7a..18590bf8 100644 --- a/modules/nf-core/rtgtools/pedfilter/rtgtools-pedfilter.diff +++ b/modules/nf-core/rtgtools/pedfilter/rtgtools-pedfilter.diff @@ -1,9 +1,4 @@ Changes in module 'nf-core/rtgtools/pedfilter' -<<<<<<< HEAD -'modules/nf-core/rtgtools/pedfilter/environment.yml' is unchanged -'modules/nf-core/rtgtools/pedfilter/meta.yml' is unchanged -======= ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 Changes in 'rtgtools/pedfilter/main.nf': --- modules/nf-core/rtgtools/pedfilter/main.nf +++ modules/nf-core/rtgtools/pedfilter/main.nf @@ -16,15 +11,9 @@ Changes in 'rtgtools/pedfilter/main.nf': -<<<<<<< HEAD -'modules/nf-core/rtgtools/pedfilter/tests/main.nf.test.snap' is unchanged -'modules/nf-core/rtgtools/pedfilter/tests/nextflow.config' is unchanged -'modules/nf-core/rtgtools/pedfilter/tests/main.nf.test' is unchanged -======= 'modules/nf-core/rtgtools/pedfilter/environment.yml' is unchanged 'modules/nf-core/rtgtools/pedfilter/meta.yml' is unchanged 'modules/nf-core/rtgtools/pedfilter/tests/main.nf.test' is unchanged 'modules/nf-core/rtgtools/pedfilter/tests/main.nf.test.snap' is unchanged 'modules/nf-core/rtgtools/pedfilter/tests/nextflow.config' is unchanged ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 ************************************************************ diff --git a/modules/nf-core/samtools/faidx/environment.yml b/modules/nf-core/samtools/faidx/environment.yml index 37884bae..f8450fa5 100644 --- a/modules/nf-core/samtools/faidx/environment.yml +++ b/modules/nf-core/samtools/faidx/environment.yml @@ -1,15 +1,9 @@ -<<<<<<< HEAD -channels: - - conda-forge - - bioconda -======= name: samtools_faidx channels: - conda-forge - bioconda - defaults ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 dependencies: - bioconda::htslib=1.20 diff --git a/modules/nf-core/somalier/relate/somalier-relate.diff b/modules/nf-core/somalier/relate/somalier-relate.diff index 513bc3ec..918d80b2 100644 --- a/modules/nf-core/somalier/relate/somalier-relate.diff +++ b/modules/nf-core/somalier/relate/somalier-relate.diff @@ -1,9 +1,4 @@ Changes in module 'nf-core/somalier/relate' -<<<<<<< HEAD -'modules/nf-core/somalier/relate/environment.yml' is unchanged -'modules/nf-core/somalier/relate/meta.yml' is unchanged -======= ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 Changes in 'somalier/relate/main.nf': --- modules/nf-core/somalier/relate/main.nf +++ modules/nf-core/somalier/relate/main.nf @@ -33,15 +28,9 @@ Changes in 'somalier/relate/main.nf': cat <<-END_VERSIONS > versions.yml "${task.process}": -<<<<<<< HEAD -'modules/nf-core/somalier/relate/tests/main.nf.test.snap' is unchanged -'modules/nf-core/somalier/relate/tests/tags.yml' is unchanged -'modules/nf-core/somalier/relate/tests/main.nf.test' is unchanged -======= 'modules/nf-core/somalier/relate/environment.yml' is unchanged 'modules/nf-core/somalier/relate/meta.yml' is unchanged 'modules/nf-core/somalier/relate/tests/tags.yml' is unchanged 'modules/nf-core/somalier/relate/tests/main.nf.test' is unchanged 'modules/nf-core/somalier/relate/tests/main.nf.test.snap' is unchanged ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 ************************************************************ diff --git a/modules/nf-core/tabix/tabix/environment.yml b/modules/nf-core/tabix/tabix/environment.yml index 8fd6ad50..4d1f9dd4 100644 --- a/modules/nf-core/tabix/tabix/environment.yml +++ b/modules/nf-core/tabix/tabix/environment.yml @@ -1,15 +1,9 @@ -<<<<<<< HEAD -channels: - - conda-forge - - bioconda -======= name: tabix_tabix channels: - conda-forge - bioconda - defaults ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 dependencies: - bioconda::htslib=1.20 diff --git a/modules/nf-core/untar/environment.yml b/modules/nf-core/untar/environment.yml index 58e0ef80..4f498244 100644 --- a/modules/nf-core/untar/environment.yml +++ b/modules/nf-core/untar/environment.yml @@ -1,14 +1,8 @@ -<<<<<<< HEAD -channels: - - conda-forge - - bioconda -======= name: untar channels: - conda-forge - bioconda - defaults ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 dependencies: - conda-forge::grep=3.11 - conda-forge::sed=4.8 diff --git a/tests/subworkflows/local/cram_call_genotype_gatk4/main.nf.test.snap b/tests/subworkflows/local/cram_call_genotype_gatk4/main.nf.test.snap index 719e14c1..a0aec425 100644 --- a/tests/subworkflows/local/cram_call_genotype_gatk4/main.nf.test.snap +++ b/tests/subworkflows/local/cram_call_genotype_gatk4/main.nf.test.snap @@ -40,11 +40,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, -<<<<<<< HEAD - "timestamp": "2024-09-05T11:18:02.353352239" -======= "timestamp": "2024-09-05T17:35:02.44674969" ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 }, "filter - family": { "content": [ @@ -70,11 +66,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, -<<<<<<< HEAD - "timestamp": "2024-09-05T11:19:14.883570897" -======= "timestamp": "2024-09-05T17:35:46.768542501" ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 }, "default - gvcfs": { "content": [ @@ -124,11 +116,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, -<<<<<<< HEAD - "timestamp": "2024-09-05T11:16:25.448441115" -======= "timestamp": "2024-09-05T17:33:52.045772718" ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 }, "only_call - family": { "content": [ @@ -171,10 +159,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, -<<<<<<< HEAD - "timestamp": "2024-09-05T11:21:57.601081087" -======= "timestamp": "2024-09-06T14:26:29.249708339" ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 } } \ No newline at end of file diff --git a/tests/subworkflows/local/vcf_annotation/main.nf.test.snap b/tests/subworkflows/local/vcf_annotation/main.nf.test.snap index f9e7b1ad..d3ebc487 100644 --- a/tests/subworkflows/local/vcf_annotation/main.nf.test.snap +++ b/tests/subworkflows/local/vcf_annotation/main.nf.test.snap @@ -22,11 +22,7 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, -<<<<<<< HEAD - "timestamp": "2024-09-05T12:53:05.739638954" -======= "timestamp": "2024-09-05T17:39:23.107888975" ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 }, "vcfanno": { "content": [ @@ -51,10 +47,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, -<<<<<<< HEAD - "timestamp": "2024-09-05T12:53:27.894947052" -======= "timestamp": "2024-09-05T17:39:39.640344999" ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 } } \ No newline at end of file diff --git a/tests/subworkflows/local/vcf_validate_small_variants/main.nf.test.snap b/tests/subworkflows/local/vcf_validate_small_variants/main.nf.test.snap index 41c882d3..7d04aca4 100644 --- a/tests/subworkflows/local/vcf_validate_small_variants/main.nf.test.snap +++ b/tests/subworkflows/local/vcf_validate_small_variants/main.nf.test.snap @@ -221,10 +221,6 @@ "nf-test": "0.9.0", "nextflow": "24.04.4" }, -<<<<<<< HEAD - "timestamp": "2024-09-04T17:19:41.712263383" -======= "timestamp": "2024-09-05T17:41:19.06545291" ->>>>>>> 3726a041a4fa98d73748421c2a5e8a5b3cd6e7c1 } } \ No newline at end of file