supp

doc/RELEASE.md

+This project runs four R scripts automatically using apptainer.
+
+Installation is described in "doc/01install.md", and execution is described in "doc/02run.md".
+
+Version: 0.1.0 

workflows/makefile_ex

@@ -5,6 +5,14 @@ run_tp2: results/data/penncath.bim results/data/penncath.bed results/data/pennca
 
 # Générer les fichiers penncath.bim, penncath.bed et penncath.fam en exécutant download_data.R
 results/data/penncath.bim results/data/penncath.bed results/data/penncath.fam:
+<<<<<<< HEAD
 	Rscript sources/download_data.R  
+=======
+	Rscript sources/download_data.R  # Ceci aussi doit commencer par une tabulation
+	
+	
+	
+	   
+>>>>>>> release/0.1.0