merge des deux readme.md
This commit is contained in:
11
README.md
11
README.md
@@ -1,15 +1,12 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
|
# map
|
||||||
|
|
||||||
|
La carte intéractive du site de l'erg. Dévellopper en jquery, utilisant leaflet.
|
||||||
|
|
||||||
Development
|
Development
|
||||||
===============
|
===============
|
||||||
|
|
||||||
To rebuild the javascript, you need to use node + rollup.
|
To rebuild the javascript, you need to use node + rollup.
|
||||||
|
```
|
||||||
npm install
|
npm install
|
||||||
=======
|
```
|
||||||
# map
|
|
||||||
|
|
||||||
La carte intéractive du site de l'erg. Dévellopper en jquery, utilisant leaflet.
|
|
||||||
>>>>>>> cb36396efa5e9c161aff3dd7cc9cc3f751b04a51
|
|
||||||
|
|||||||
Reference in New Issue
Block a user