From d69992bd3d5102a51687656543ff2dc25945d5f4 Mon Sep 17 00:00:00 2001
From: Xavier Grand <xavier.grand@inserm.fr>
Date: Fri, 30 Jun 2023 09:42:43 +0200
Subject: [PATCH] before fetch
---
src/bolero.nf | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/bolero.nf b/src/bolero.nf
index 308996d..0e7e3fa 100755
--- a/src/bolero.nf
+++ b/src/bolero.nf
@@ -171,10 +171,6 @@ if(!params.skipBC) {
}
}
-<<<<<<< HEAD
-// include { barecode } from "./nf_modules/barecode/main.nf"
-=======
->>>>>>> c281bb3789a8d844085e21f749580c29d43b35d6
include { concatenate } from "./nf_modules/seqkit/main.nf"
include { cut_5pRACE } from "./nf_modules/cutadapt/main.nf"
include { hbv_genome } from "./nf_modules/minimap2/main.nf"
--
GitLab