From 880551d246badf5e93c1ff6a68fcd28541c9e0e5 Mon Sep 17 00:00:00 2001
From: Maxime Garcia <max.u.garcia@gmail.com>
Date: Wed, 20 Nov 2019 16:00:05 +0100
Subject: [PATCH] Apply suggestions from code review

---
 conf/pipeline/sarek/munin.config | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/conf/pipeline/sarek/munin.config b/conf/pipeline/sarek/munin.config
index 5d4f490..1327936 100644
--- a/conf/pipeline/sarek/munin.config
+++ b/conf/pipeline/sarek/munin.config
@@ -13,6 +13,7 @@ params {
   vep_cache = '/data1/cache/VEP/'
 }
 
+<<<<<<< HEAD
 // Specific nf-core/sarek process configuration
 process {
   withLabel:sentieon {
@@ -21,4 +22,10 @@ process {
       container = ''
     }
   }
+=======
+// Specific nf-core/sarek configuration
+withLabel:sentieon {
+  module = {params.sentieon ? 'sentieon/201808.05' : ''}
+  if (params.sentieon) container = ''
+>>>>>>> bfcbcea... Apply suggestions from code review
 }