From 83157fbaf58919086987120e17fa80a2cbe19d96 Mon Sep 17 00:00:00 2001
From: SOLER Fiona <s23014817@V-PJ-47-058.salsa.univ-amu.fr>
Date: Wed, 23 Oct 2024 15:48:23 +0200
Subject: [PATCH] makefile
---
workflows/makefile_ex | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/workflows/makefile_ex b/workflows/makefile_ex
index 725d64c..e357fb1 100644
--- a/workflows/makefile_ex
+++ b/workflows/makefile_ex
@@ -5,14 +5,7 @@ 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
+
--
GitLab