remove trace of conflict

modules/sum_up_bins_informations.nf

 process GENOMES_ABUNDANCES_PER_SAMPLE {
    publishDir "${params.outdir}/08_binning", mode: 'copy'
-<<<<<<< HEAD
-   
-=======
-   executor "slurm"
 
->>>>>>> c084db3 (run in slurm executor to avoid bug in genobioinfo cluster)
    input:
       path coverage_files
       path flagstats_files
@@ -63,13 +58,7 @@ process ADD_QUAST_INFO_TO_BINS {
 
 process BINS_STATS_TO_MUTLIQC_FORMAT {
   publishDir "${params.outdir}/08_binning/08_4_mapping_on_final_bins/stats", mode: 'copy'
-<<<<<<< HEAD
-  
-=======
-  executor "slurm"
 
-
->>>>>>> 4d560dc (problem with memory in local execute BINS_STATS_TO_MULTIQC_FORMAT with slurm)
   input:
     path bins_stats
     path multiqc_header_count