merging

2024-02-08 16:45:37 +01:00
parent e0f725fdb0 cb36396efa
commit b50c31044a
2 changed files with 176 additions and 0 deletions
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD



@@ -7,3 +8,8 @@ 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