From 6d702d6f83d4a214040c3a9a68c69612600d6cc3 Mon Sep 17 00:00:00 2001
From: "theophile.gervreaumercier" <theophile.gervreaumercier@erg.school>
Date: Thu, 8 Feb 2024 16:48:35 +0100
Subject: [PATCH] merge des deux readme.md

---
 README.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index e0415c3..6a5fbb3 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,12 @@
-<<<<<<< HEAD
 
+# map
 
+La carte intéractive du site de l'erg. Dévellopper en jquery, utilisant leaflet.
 
 Development
 ===============
 
 To rebuild the javascript, you need to use node + rollup.
-
+```
     npm install
-=======
-# map
-
-La carte intéractive du site de l'erg. Dévellopper en jquery, utilisant leaflet.
->>>>>>> cb36396efa5e9c161aff3dd7cc9cc3f751b04a51
+```