Update ONT demultiplex analysis # 112

workflows/ont_qc/components/demultiplexont.py

@@ -53,11 +53,7 @@ class Demultiplex_ONT (Analysis):
         list_stats= []
         with open(stat_file, "r") as f_stat :
             for line in f_stat.readlines():
-<<<<<<< HEAD
                 list_stats.append(line.split())
-=======
-                list_stat.append(line.split())
->>>>>>> branch 'nG6_ont_demultiplex' of https://forgemia.inra.fr/genotoul-bioinfo/ng6.git
                 
         # Registering file's header into a list
         header = list_stats.pop(0)