From 25d4e92935e73a621c4939baf86b9364cb4d950e Mon Sep 17 00:00:00 2001
From: MaxUlysse <max.u.garcia@gmail.com>
Date: Wed, 20 Nov 2019 15:32:35 +0100
Subject: [PATCH] update docs

---
 docs/pipeline/sarek/munin.md | 4 ++++
 pipeline/sarek.config        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/pipeline/sarek/munin.md b/docs/pipeline/sarek/munin.md
index ce411c1..7589a9a 100644
--- a/docs/pipeline/sarek/munin.md
+++ b/docs/pipeline/sarek/munin.md
@@ -19,4 +19,8 @@ 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
diff --git a/pipeline/sarek.config b/pipeline/sarek.config
index aed6a1d..9457972 100644
--- a/pipeline/sarek.config
+++ b/pipeline/sarek.config
@@ -10,4 +10,4 @@
 
 profiles {
   munin { includeConfig "${params.custom_config_base}/conf/pipeline/sarek/munin.config" }
-}
+}
\ No newline at end of file