Update file atacseq_runner.sh

atacseq_runner.sh

@@ -335,11 +335,7 @@ 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
@@ -357,11 +353,7 @@ ${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