From 9c56de3ea2f091ea03756b9db9c0493ecedec25f Mon Sep 17 00:00:00 2001
From: Yohan Jarosz <yohanjarosz@yahoo.fr>
Date: Wed, 1 Apr 2015 19:27:53 +0200
Subject: [PATCH] you failed to merge correctly so there was a typo in the
file. fixed #16
---
rules/Util.rules | 5 -----
1 file changed, 5 deletions(-)
diff --git a/rules/Util.rules b/rules/Util.rules
index 829e2c5..d90a7b1 100644
--- a/rules/Util.rules
+++ b/rules/Util.rules
@@ -87,13 +87,8 @@ rule INDEX_SORTMERNA_DB:
files=config["sortmerna"]["files"],
path=DBPATH + "/sortmerna")
ref = ':'.join('%s,%s' % (a, b) for a, b in zip(input, fastaindexed))
-<<<<<<< HEAD
- shell("mkdir -p {params.outdir}")
- shell("indexdb_rna --ref {ref} --fast > {log} 2>&1")
-=======
shell("mkdir -p {DBPATH}/sortmerna")
shell("indexdb_rna --ref {ref} > {log} 2>&1")
->>>>>>> 10e6c1581a08457563678bded44ea159d5561390
rule DIAGRAMMS:
--
GitLab