midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-02-22 15:07:08 +01:00
parent 801de2c65c
commit 9c939ca23c
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -1,10 +1,6 @@
{ {
"name": "mapcomplete", "name": "mapcomplete",
<<<<<<< HEAD
"version": "0.40.0", "version": "0.40.0",
=======
"version": "0.38.1",
>>>>>>> develop
"repository": "https://github.com/pietervdvn/MapComplete", "repository": "https://github.com/pietervdvn/MapComplete",
"description": "A small website to edit OSM easily", "description": "A small website to edit OSM easily",
"bugs": "https://github.com/pietervdvn/MapComplete/issues", "bugs": "https://github.com/pietervdvn/MapComplete/issues",