From f6c2e4c65f6b1f355e0c248bd392e75f77c3c321 Mon Sep 17 00:00:00 2001 From: Maxime Garcia Date: Wed, 20 Nov 2019 15:54:29 +0100 Subject: [PATCH] Update docs/pipeline/sarek/munin.md Update conf/pipeline/sarek/munin.config testing out module and containers collision --- conf/pipeline/sarek/munin.config | 8 -------- docs/pipeline/sarek/munin.md | 4 ---- 2 files changed, 12 deletions(-) diff --git a/conf/pipeline/sarek/munin.config b/conf/pipeline/sarek/munin.config index 8c4e1a9..5d4f490 100644 --- a/conf/pipeline/sarek/munin.config +++ b/conf/pipeline/sarek/munin.config @@ -4,14 +4,6 @@ params { // Specific nf-core/configs params config_profile_contact = 'Maxime Garcia (@MaxUlysse)' config_profile_description = 'nf-core/sarek MUNIN profile provided by nf-core/configs' -<<<<<<< HEAD -======= - - // Specific nf-core/sarek configs params - max_memory = 752.GB - max_cpus = 46 - max_time = 72.h ->>>>>>> 946bf37... Update conf/pipeline/sarek/munin.config // Specific nf-core/sarek params annotation_cache = true diff --git a/docs/pipeline/sarek/munin.md b/docs/pipeline/sarek/munin.md index 7589a9a..ce411c1 100644 --- a/docs/pipeline/sarek/munin.md +++ b/docs/pipeline/sarek/munin.md @@ -19,8 +19,4 @@ Specific configurations for MUNIN has been made for sarek. * Path to `vep_cache`: `/data1/cache/VEP/` * Path to `pon`: `/data1/PON/vcfs/BTB.PON.vcf.gz` * Path to `pon_index`: `/data1/PON/vcfs/BTB.PON.vcf.gz.tbi` -<<<<<<< HEAD * Load module `Sentieon` for Processes with `sentieon` labels -======= -* Load module `Sentieon` for Processes with `sentieon` labels ->>>>>>> 5dc5555... update docs