Solve merge conflict

f6119a70 · elabaron · ec3eb579 · 3efbbb5e · f6119a70 · f6119a70
Commit f6119a70 authored Dec 6, 2019 by elabaron
--- a/src/nf_modules/subread/tests.sh
+++ b/src/nf_modules/subread/tests.sh
--- a/src/nf_modules/urqt/tests.sh
+++ b/src/nf_modules/urqt/tests.sh
--- a/src/nf_modules/urqt/trimming_paired.config
+++ b/src/nf_modules/urqt/trimming_paired.config
--- a/src/nf_modules/urqt/trimming_paired.nf
+++ b/src/nf_modules/urqt/trimming_paired.nf
--- a/src/nf_modules/urqt/trimming_single.config
+++ b/src/nf_modules/urqt/trimming_single.config
--- a/src/nf_modules/urqt/trimming_single.nf
+++ b/src/nf_modules/urqt/trimming_single.nf
--- a/src/training_dataset.config
+++ b/src/training_dataset.config
--- a/src/training_dataset.nf
+++ b/src/training_dataset.nf