Resolved merge conflict in atacseq_runner.sh

atacseq/README.md

-# ![nf-core/atacseq](docs/images/nf-core-atacseq_logo_light.png#gh-light-mode-only) ![nf-core/atacseq](docs/images/nf-core-atacseq_logo_dark.png#gh-dark-mode-only)
+# ![nf-core/atacseq](docs/images/nf-core-atacseq_logo_light.png#gh-light-mode-only)
 
 [![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/atacseq/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.2634132-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.2634132)
 

atacseq_runner.sh

@@ -335,7 +335,11 @@ done
 
 NFCORE_WF="nfcore_atacseq"
 NFCORE_WF_VERSION="2.1.2"
+<<<<<<< HEAD
 NFCORE_WF_COMMIT="1a1dbe52ffbd82256c941a032b0e22abbd925b8a"  # the commit for tags/2.1.2 
+=======
+NFCORE_WF_COMMIT="1a1dbe52ffbd82256c941a032b0e22abbd925b8a"  # the commit for tags/2.0 #What is this???
+>>>>>>> 41d39af1ea5e6b72c1fabcec360723849f2d85cc
 ATACseq_DIR="$SCRIPTPATH/$NFCORE_WF"
 
 # set max total resources
@@ -353,7 +357,11 @@ ${max_time}, ${max_cpus} CPUs, ${max_memory} Memory on $(hostname -s).
 config_atacseq="${ATACseq_DIR}/workflows/atacseq.nf" ##Check this??
 if [[ -f $config_atacseq ]]; then
   if ! grep "// NfcoreTemplate.email" $config_atacseq > /dev/null; then
+<<<<<<< HEAD
     sed -i "s/NfcoreTemplate.email/\/\/ NfcoreTemplate.email/g" $config_atacseq
+=======
+    sed -i "s/NfcoreTemplate.email/\/\/ NfcoreTemplate.email/g" $config_cutandrun
+>>>>>>> 41d39af1ea5e6b72c1fabcec360723849f2d85cc
   fi
   if ! grep "// NfcoreTemplate.summary" $config_atacseq > /dev/null; then
     sed -i "s/NfcoreTemplate.summary/\/\/ NfcoreTemplate.summary/g" $config_atacseq